David S. Miller 3313da8188
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
The netfilter conflicts were rather simple overlapping
changes.
However, the cls_tcindex.c stuff was a bit more complex.
On the 'net' side, Cong is fixing several races and memory
leaks. Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.
What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU. I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.
Signed-off-by: David S. Miller <davem@davemloft.net >
2019-02-15 12:38:38 -08:00
2018-09-08 01:39:47 +09:00
2018-10-14 10:25:47 +02:00
2018-09-26 09:56:07 -07:00
2019-02-08 15:00:17 -08:00
2019-01-28 19:38:33 -08:00
2018-09-18 19:55:01 -07:00
2019-01-30 00:44:08 -08:00
2019-02-10 09:28:43 -08:00
2019-02-10 09:28:43 -08:00
2019-01-22 17:18:09 -08:00
2018-07-13 12:18:18 -04:00
2019-01-15 21:33:36 -08:00
2018-10-31 12:37:12 -07:00
2018-08-07 12:39:13 -07:00
2019-01-23 11:18:00 -08:00
2019-01-24 22:18:48 -08:00
2018-09-26 20:22:19 -07:00
2018-07-30 09:10:25 -07:00
2019-02-01 11:53:15 +01:00
2019-01-03 18:57:57 -08:00
2018-07-27 13:17:50 -07:00
2019-02-12 12:13:22 -05:00
2019-01-17 11:31:24 -08:00
2018-10-17 21:51:13 -07:00
2018-11-30 13:21:52 -08:00
2019-02-13 21:07:47 -08:00
2018-11-30 17:12:39 -08:00
2018-11-17 21:37:29 -08:00
2018-08-29 19:42:52 -07:00
2018-11-07 23:00:23 -08:00
2018-12-10 15:53:04 -08:00
2018-11-08 17:13:08 -08:00
2018-09-05 10:08:25 +02:00
2018-11-02 23:54:56 -07:00
2018-11-07 16:12:38 -08:00
2018-12-15 13:23:02 -08:00
2019-01-27 13:29:43 -08:00
2018-10-17 17:45:07 -07:00
2019-01-25 21:37:11 -08:00
2018-12-24 15:27:56 -08:00
2018-11-07 16:12:38 -08:00
2018-06-05 10:45:24 -04:00
2019-02-08 21:50:15 -08:00
2018-10-19 11:03:06 -07:00
2018-10-16 00:13:12 -07:00
2018-11-08 17:13:08 -08:00
2019-01-15 13:33:44 -08:00
2019-01-26 09:43:03 -08:00
2019-01-28 11:15:58 +01:00
2018-11-07 16:23:05 -08:00
2019-01-25 21:37:11 -08:00
2018-11-07 16:23:05 -08:00
2019-01-30 22:13:34 -08:00
2018-07-11 23:10:19 -07:00
2018-09-13 09:04:58 -07:00
2019-02-01 12:11:13 +01:00
2018-12-19 13:37:34 -08:00
2019-01-25 01:50:03 +01:00
2018-08-01 09:52:30 -07:00
2019-02-01 11:06:55 +01:00
2019-02-12 13:41:33 -05:00
2018-09-25 20:17:35 -07:00
2018-11-08 17:13:08 -08:00
2018-11-07 16:12:39 -08:00
2018-08-28 11:11:47 +02:00
2018-09-26 20:30:55 -07:00
2018-11-06 15:00:45 -08:00
2019-02-12 13:41:33 -05:00
2018-07-21 10:43:12 -05:00
2018-06-22 13:43:27 +09:00
2018-07-31 09:22:48 +02:00
2018-12-20 16:56:04 -08:00
2018-06-30 20:42:25 +09:00
2018-08-11 01:58:46 +02:00
2019-02-15 12:38:38 -08:00
2018-06-06 14:07:53 -04:00
2019-02-06 14:17:03 -08:00
2019-01-25 22:41:08 -08:00
2019-02-01 15:05:07 -08:00
2018-07-07 10:58:49 +09:00
2018-12-03 14:15:26 -08:00
2018-11-08 17:13:08 -08:00
2019-01-17 15:18:47 -08:00
2019-01-25 01:50:03 +01:00
2018-08-29 12:25:53 -07:00
2018-12-20 11:53:36 -08:00
3313da8188