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
..
accounting	…
arch	SPDX update for 5.2-rc6	2019-06-21 09:58:42 -07:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
build	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
cgroup	…
crypto	…
debugging	…
firewire	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
firmware	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
gpio	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
hv	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 280	2019-06-05 17:36:36 +02:00
iio	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-06-20 00:06:27 -04:00
io_uring	tools/io_uring: sync with liburing	2019-05-23 10:25:26 -06:00
kvm/kvm_stat	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 499	2019-06-19 17:09:53 +02:00
laptop	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 505	2019-06-19 17:11:22 +02:00
leds	…
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
memory-model	…
nfsd	…
objtool	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
pci	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 341	2019-06-05 17:37:07 +02:00
pcmcia	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 247	2019-06-19 17:09:08 +02:00
perf	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
power	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
scripts	…
spi	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 178	2019-05-30 11:29:19 -07:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-27 21:06:39 -07:00
thermal/tmon	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 89	2019-05-24 17:37:52 +02:00
time	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282	2019-06-05 17:36:37 +02:00
usb	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157	2019-05-30 11:26:37 -07:00
virtio	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 482	2019-06-19 17:09:52 +02:00
vm	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282	2019-06-05 17:36:37 +02:00
wmi	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
Makefile	…