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-07-11 06:08:58 -04:00
2017-09-01 22:49:47 +02:00
2017-09-08 18:55:50 +02:00
2017-10-28 19:24:39 +09:00
2017-04-05 10:15:20 +02:00
2017-10-07 23:15:08 +01:00
2017-10-30 21:09:24 +09:00
2017-10-12 22:23:03 -07:00
2017-04-12 22:02:36 +02:00
2017-10-11 20:15:43 -07:00
2017-10-24 17:54:19 +09:00
2017-10-18 11:42:48 +01:00
2017-07-21 03:38:43 +01:00
2017-10-05 18:44:17 -07:00
2017-07-01 07:39:07 -07:00
2017-07-04 22:35:19 +01:00
2016-02-09 04:45:49 -05:00
2017-05-27 18:51:41 -04:00
2017-10-25 10:54:39 +09:00
2017-08-11 14:59:24 -07:00
2017-07-04 22:35:16 +01:00
2017-10-02 14:08:27 +02:00
2016-07-08 12:20:57 +02:00
2017-01-20 12:12:13 -05:00
2017-07-04 01:29:04 -07:00
2016-04-19 20:09:25 -04:00
2016-04-25 16:44:27 -04:00
2016-06-25 12:19:35 -04:00
2016-04-25 16:44:27 -04:00
2016-06-09 23:41:03 -07:00
2017-08-31 14:42:19 -07:00
2017-07-04 22:35:15 +01:00
2017-10-18 12:39:36 +01:00
2017-10-18 12:39:36 +01:00
2017-10-28 00:00:09 +09:00
2016-02-16 20:21:48 -05:00
2017-10-10 12:30:16 -07:00
2017-02-07 13:07:46 -05:00
2017-10-27 11:52:52 +09:00
2017-08-22 14:29:30 -07:00
2017-04-14 10:06:42 +02:00
2015-09-23 15:33:15 -07:00
2017-09-27 11:33:27 -07:00
2017-08-03 15:35:59 -07:00
2017-09-05 11:40:08 -07:00
2017-08-24 18:21:17 -07:00
2016-05-20 18:03:16 -04:00
2017-10-30 21:09:24 +09:00
2017-10-11 09:49:34 +02:00
2016-12-05 15:21:59 -05:00
2017-06-05 10:54:55 -04:00
2016-06-17 20:23:32 -07:00
2016-08-18 01:17:32 -04:00
2017-02-08 14:38:18 -05:00
2016-07-25 17:55:43 -07:00
2016-03-14 12:19:46 -04:00
2016-04-27 22:48:25 -04:00
2017-01-25 16:00:33 +01:00
2016-01-04 20:40:41 +01:00
2017-07-04 01:29:04 -07:00
2017-02-03 15:16:45 -05:00
2015-12-15 23:25:20 -05:00
2017-01-18 13:04:28 -05:00
2017-08-07 11:39:22 -07:00
2017-03-09 18:23:27 -08:00
2017-10-18 12:39:55 +01:00
2017-10-01 17:55:54 -07:00
2017-10-18 12:39:55 +01:00
2017-08-07 11:39:21 -07:00
2017-10-30 21:09:24 +09:00
2016-12-29 11:38:31 -05:00
2017-07-17 08:59:01 -07:00
2016-03-13 23:55:13 -04:00
2017-10-07 21:22:58 +01:00
2017-10-07 21:22:57 +01:00
2017-04-21 13:21:30 -04:00
2017-09-29 06:19:32 +01:00
2017-09-19 16:32:24 -07:00
2017-04-28 12:00:10 +02:00
2017-08-21 17:06:42 -07:00
2017-10-06 09:52:31 -07:00
2017-07-04 22:35:17 +01:00
2017-01-13 09:38:42 +01:00
2016-08-17 19:36:23 -04:00
2016-10-13 12:05:26 -04:00
2017-07-04 22:35:16 +01:00
2017-10-25 12:06:25 +09:00
2017-07-04 22:35:15 +01:00
2017-05-30 11:55:32 -04:00
2017-09-21 11:42:00 +02:00
2016-07-08 13:23:12 +02:00
2017-04-01 20:21:44 -07:00
2016-10-03 02:00:22 -04:00
2017-09-05 09:11:45 -07:00
2017-07-01 07:39:07 -07:00
2017-09-25 20:36:17 -07:00
2017-08-03 15:35:59 -07:00
2016-07-05 09:06:29 -07:00
2017-07-01 07:39:09 -07:00
2017-09-25 20:18:27 -07:00
2015-12-08 22:02:33 -05:00
2017-07-04 22:35:17 +01:00
2016-07-08 12:20:57 +02:00
2017-08-29 15:16:52 -07:00
2016-03-23 22:09:58 -04:00
2017-10-30 21:09:24 +09:00
2017-10-27 09:49:24 -07:00
2016-08-15 10:55:53 -07:00
2017-10-01 03:55:47 +01:00
2017-01-24 13:44:28 -05:00
2017-08-07 11:39:21 -07:00
2017-08-07 11:39:22 -07:00
2016-12-25 17:21:22 +01:00
2017-10-20 13:21:36 +01:00
2017-10-01 03:55:47 +01:00
2017-10-04 10:33:59 -07:00
2017-10-30 21:09:24 +09:00
2017-03-02 08:42:31 +01:00
2017-06-08 10:53:29 -04:00
2016-11-09 20:40:06 -05:00
2017-08-25 17:10:23 -07:00
2017-01-09 16:07:41 -05:00
2016-04-28 11:49:45 -04:00
2016-01-19 14:44:23 -05:00
2017-10-24 18:46:22 +09:00
2017-10-25 10:37:11 +09:00
2017-10-09 10:18:11 -07:00
2017-10-30 21:09:24 +09:00
2017-06-15 12:12:40 -04:00
2016-05-03 16:08:14 -04:00
2017-08-23 20:42:09 -07:00
2017-08-29 15:16:52 -07:00
2017-07-24 13:52:59 -07:00
2017-10-01 03:55:47 +01:00
2017-05-16 15:41:29 -04:00
2017-08-29 15:16:52 -07:00
2017-06-14 13:52:44 +02:00
2017-07-04 22:35:18 +01:00
2017-08-31 09:04:03 +02:00
e1ea2f9856