1. 01 Nov, 2017 15 commits
  2. 31 Oct, 2017 24 commits
  3. 30 Oct, 2017 1 commit
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e1ea2f98
      David S. Miller authored
      Several conflicts here.
      
      NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
      nfp_fl_output() needed some adjustments because the code block is in
      an else block now.
      
      Parallel additions to net/pkt_cls.h and net/sch_generic.h
      
      A bug fix in __tcp_retransmit_skb() conflicted with some of
      the rbtree changes in net-next.
      
      The tc action RCU callback fixes in 'net' had some overlap with some
      of the recent tcf_block reworking.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e1ea2f98