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
..
boot	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
configs	net: sched: remove NET_CLS_IND config option	2019-06-15 14:06:13 -07:00
crypto	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
include	powerpc fixes for 5.2 #5	2019-06-22 09:09:42 -07:00
kernel	powerpc fixes for 5.2 #5	2019-06-22 09:09:42 -07:00
kvm	powerpc fixes for 5.2 #5	2019-06-22 09:09:42 -07:00
lib	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
math-emu	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
mm	powerpc fixes for 5.2 #6	2019-06-24 21:20:39 +08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
oprofile	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333	2019-06-05 17:37:06 +02:00
perf	powerpc fixes for 5.2 #3	2019-06-02 10:21:04 -07:00
platforms	powerpc fixes for 5.2 #5	2019-06-22 09:09:42 -07:00
purgatory	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441	2019-06-05 17:37:17 +02:00
sysdev	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
tools	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xmon	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
Kbuild	treewide: Add SPDX license identifier - Kbuild	2019-05-30 11:32:33 -07:00
Kconfig	mm: memblock: make keeping memblock memory opt-in rather than opt-out	2019-05-14 09:47:50 -07:00
Kconfig.debug
Makefile	treewide: prefix header search paths with $(srctree)/	2019-05-18 11:49:57 +09:00
Makefile.postlink