David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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: David S. Miller <davem@davemloft.net>
2017-10-30 21:09:24 +09:00
..
2017-10-18 18:51:27 -04:00
2017-09-04 19:05:15 -04:00
2017-08-24 13:23:03 -07:00
2017-10-18 18:51:27 -04:00
2017-09-18 12:24:26 +02:00
2017-09-11 22:01:44 -07:00
2017-07-06 03:31:46 -04:00
2017-09-08 19:33:25 -07:00
2017-10-26 08:45:40 +02:00
2017-09-04 19:05:15 -04:00
2017-10-18 14:51:50 -04:00
2017-06-22 11:44:55 -04:00
2017-07-06 03:27:09 -04:00
2017-07-06 03:27:09 -04:00
2017-08-17 22:06:03 +02:00
2017-09-03 20:24:30 -04:00