David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
configs	arm64: defconfig: add MEDIA_PLATFORM_SUPPORT	2020-05-14 00:14:38 +02:00
crypto	crypto: arch/nhpoly1305 - process in explicit 4k chunks	2020-04-30 15:16:59 +10:00
include	arm64: Add get_user() type annotation on the !access_ok() path	2020-05-22 16:59:49 +01:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
kvm	KVM: arm64: Fix 32bit PC wrap-around	2020-05-01 09:51:08 +01:00
lib	arm64: fix spelling mistake "ca not" -> "cannot"	2020-03-17 18:22:40 +00:00
mm	arm64: hugetlb: avoid potential NULL dereference	2020-05-07 09:24:15 +01:00
net
xen	arm64: xen: Use modern annotations for assembly functions	2020-01-09 16:09:42 +00:00
Kbuild
Kconfig	bpf: Restrict bpf_probe_read{, str}() only to archs where they work	2020-05-15 08:10:36 -07:00
Kconfig.debug	arm64: remove CONFIG_DEBUG_ALIGN_RODATA feature	2020-04-01 21:44:43 +01:00
Kconfig.platforms	ARM: SoC updates	2020-04-03 15:02:35 -07:00
Makefile	arm64: Always force a branch protection mode when the compiler has one	2020-04-01 21:23:40 +01:00