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: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
configs	parisc: configs: Remove useless UEVENT_HELPER_PATH	2019-06-06 14:12:20 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
kernel	Merge branch 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2019-06-25 05:52:31 +08:00
lib	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 153	2019-05-30 11:26:32 -07:00
math-emu	Merge branch 'parisc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2019-06-06 13:13:09 -07:00
mm	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
Kconfig	parisc: Allow building 64-bit kernel without -mlong-calls compiler option	2019-05-20 10:51:39 +02:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	parisc: generate uapi header and system call table files	2018-12-10 08:26:04 +01:00
nm	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00