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
..
auxdisplay	auxdisplay: Replace licenses with SPDX identifiers	2018-04-12 19:02:45 +02:00
binderfs	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
configfs	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 145	2019-05-30 11:25:18 -07:00
connector	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
hidraw	HID: samples/hidraw: fix typo in printed message	2018-11-21 00:31:58 +01:00
hw_breakpoint	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
kdb	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
kfifo	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 465	2019-06-19 17:09:10 +02:00
kobject	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
kprobes	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
livepatch	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
mei	samples: mei: use /dev/mei0 instead of /dev/mei	2019-01-30 15:24:45 +01:00
mic/mpssd	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 290	2019-06-05 17:36:38 +02:00
pidfd	samples: make pidfd-metadata fail gracefully on older kernels	2019-06-24 15:55:50 +02:00
pktgen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
qmi	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
rpmsg	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282	2019-06-05 17:36:37 +02:00
seccomp	samples: guard sub-directories with CONFIG options	2019-05-18 11:29:01 +09:00
timers	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
trace_events	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
trace_printk	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
uhid	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
v4l	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
vfio-mdev	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
vfs	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36	2019-05-24 17:27:11 +02:00
watchdog	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	samples: guard sub-directories with CONFIG options	2019-05-18 11:29:01 +09:00