| commit | d96ff269a04be286989ead13bf8b4be55bdee8ee | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jun 27 21:06:39 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jun 27 21:06:39 2019 -0700 |
| tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f | |
| parent | 3a49584477ff4c8838833be9f3b7cc13f0f7c0d3 [diff] | |
| parent | 556e2f6020bf90f63c5dd65e9a2254be6db3185b [diff] |
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>