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