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-06-18 11:20:24 -07:00
2019-06-21 09:58:42 -07:00
2019-05-31 08:34:32 -07:00
2019-06-21 09:58:42 -07:00
2019-06-08 12:52:42 -07:00
2018-07-03 16:44:45 -04:00
2018-10-29 14:29:58 -07:00
2019-04-08 18:21:02 -05:00
2019-03-08 14:48:40 -08:00
2019-01-30 17:44:07 -05:00
2019-04-09 19:20:57 -04:00
2019-02-07 16:38:35 +01:00