David S. Miller d96ff269a0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net >
2019-06-27 21:06:39 -07:00
2019-05-14 10:30:10 -07:00
2019-05-13 18:34:44 -05:00
2019-05-14 10:30:10 -07:00
2019-06-21 22:05:42 -04:00
2019-05-14 10:30:10 -07:00
2018-10-04 16:37:37 -05:00
2019-02-26 11:08:07 +01:00
2019-05-09 07:49:58 -05:00
2018-01-28 15:48:29 -06:00
2018-03-19 14:20:43 -05:00
2019-01-01 19:04:37 -06:00
2018-07-31 10:43:43 -05:00
2019-01-14 17:01:20 -06:00
2019-04-15 13:24:02 +01:00
2018-03-19 14:20:43 -05:00
2019-04-29 16:12:05 -05:00
2019-05-13 18:34:41 -05:00
2019-06-22 09:42:29 -07:00
2019-05-27 10:51:06 +02:00
2019-02-22 10:51:14 +00:00
2019-02-22 10:51:14 +00:00
2019-06-14 00:03:27 +02:00
2018-03-19 14:20:43 -05:00
2018-10-02 10:14:32 +02:00
2018-04-24 16:47:16 -05:00
2019-05-09 07:49:54 -05:00
2019-05-09 07:49:49 -05:00
2019-05-14 10:30:10 -07:00
2019-05-14 10:30:10 -07:00
2019-05-14 10:30:10 -07:00
2019-03-20 15:11:11 -05:00
2019-05-14 10:30:10 -07:00
2018-09-17 16:32:23 -05:00
2018-06-29 21:17:26 -05:00
2019-04-29 16:12:05 -05:00
2019-05-13 18:34:48 -05:00
2018-03-19 14:20:43 -05:00
2018-04-11 08:46:50 -05:00
2019-05-09 07:49:54 -05:00
2018-03-19 14:20:43 -05:00
2018-02-01 11:40:07 -06:00
2018-08-14 16:04:46 -05:00
2019-05-13 18:34:46 -05:00
d96ff269a0