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