David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
configs	ARM: SoC defconfig updates	2019-05-16 09:35:26 -07:00
crypto	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
include	arm64 fixes for -rc5	2019-06-14 06:16:47 -10:00
kernel	arm64 fixes for -rc5	2019-06-14 06:16:47 -10:00
kvm	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422	2019-06-05 17:37:15 +02:00
lib	arm64: Makefile: Replace -pg with CC_FLAGS_FTRACE	2019-04-09 10:34:59 +01:00
mm	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441	2019-06-05 17:37:17 +02:00
net	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
xen	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Kconfig	Second round of arm64 fixes for -rc2	2019-05-24 11:03:26 -07:00
Kconfig.debug	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Kconfig.platforms	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	arm64: Don't unconditionally add -Wno-psabi to KBUILD_CFLAGS	2019-06-12 10:54:47 +01:00