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
..
alpha	mm/special: create generic fallbacks for pte_special() and pte_mkspecial()	2020-04-10 15:36:21 -07:00
arc	ARC fixes for 5.7	2020-05-19 15:40:51 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
c6x	mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS	2020-04-10 15:36:21 -07:00
csky	csky: Fixup CONFIG_DEBUG_RSEQ	2020-05-28 00:18:36 +00:00
h8300	h8300: ignore vmlinux.lds	2020-04-23 16:41:26 +09:00
hexagon	arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>	2020-04-23 10:50:26 +09:00
ia64	ia64: Hide the archdata.iommu field behind generic IOMMU_API	2020-05-27 16:41:29 +02:00
m68k	m68k: Drop redundant generic-y += hardirq.h	2020-04-13 11:08:52 -07:00
microblaze	mm/special: create generic fallbacks for pte_special() and pte_mkspecial()	2020-04-10 15:36:21 -07:00
mips	Merge branch 'work.sysctl' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-04-28 21:23:38 +02:00
nds32	arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>	2020-04-23 10:50:26 +09:00
nios2	nios2 update for v5.7-rc1	2020-04-11 11:38:44 -07:00
openrisc	mm/special: create generic fallbacks for pte_special() and pte_mkspecial()	2020-04-10 15:36:21 -07:00
parisc	parisc: Fix kernel panic in mem_init()	2020-05-29 15:47:55 +02:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 10:16:53 -07:00
riscv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-24 13:47:27 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-24 13:47:27 -07:00
sh	sh: include linux/time_types.h for sockios	2020-05-23 10:26:31 -07:00
sparc	sparc32: fix page table traversal in srmmu_nocache_init()	2020-05-23 13:59:12 -07:00
um	um: Fix typo in vector driver transport option definition	2020-04-29 21:22:15 +02:00
unicore32	mm/special: create generic fallbacks for pte_special() and pte_mkspecial()	2020-04-10 15:36:21 -07:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
xtensa	arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>	2020-04-23 10:50:26 +09:00
.gitignore
Kconfig	dma-mapping updates for 5.7	2020-04-04 10:12:47 -07:00