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