David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
boot	Fixes for dtc warnings, fixes for ethernet transfers on rk3328,	2019-04-07 15:15:31 -07:00
configs	Allwinner arm64 defconfig changes for 5.1	2019-02-15 16:51:26 +01:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-03-05 09:09:55 -08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-04-28 08:42:41 -04:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
kvm	KVM: arm64: Reset the PMU in preemptible context	2019-03-19 17:56:24 +00:00
lib	arm64: string: use asm EXPORT_SYMBOL()	2018-12-10 11:50:12 +00:00
mm	arm64: mm: Ensure tail of unaligned initrd is reserved	2019-04-23 10:56:24 +01:00
net	bpf, arm64: use more scalable stadd over ldxr / stxr loop in xadd	2019-04-26 18:53:40 -07:00
xen	arm64: mm: Add additional parameter to uaccess_ttbr0_disable	2018-01-17 13:57:49 +01:00
Kconfig	arm64: remove obsolete selection of MULTI_IRQ_HANDLER	2019-03-20 17:34:16 +00:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Kconfig.platforms	This pull request brings in a build fix for arm64 with bcm2835	2019-03-18 10:31:24 -07:00
Makefile	kasan, arm64: adjust shadow size for tag-based mode	2018-12-28 12:11:43 -08:00