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	x86/boot: Mark global variables as static	2020-05-14 11:11:20 +02:00
configs	compiler: remove CONFIG_OPTIMIZE_INLINING entirely	2020-04-07 10:43:42 -07:00
crypto	crypto: arch/nhpoly1305 - process in explicit 4k chunks	2020-04-30 15:16:59 +10:00
entry	x86/unwind/orc: Fix premature unwind stoppage due to IRET frames	2020-04-25 12:22:29 +02:00
events	perf/x86/cstate: Add Jasper Lake CPU support	2020-04-22 21:43:12 +02:00
hyperv	x86/hyperv: Properly suspend/resume reenlightenment notifications	2020-05-13 15:02:03 +00:00
ia32	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2020-03-31 11:04:05 -07:00
include	A pile of x86 fixes:	2020-05-31 10:45:11 -07:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
kvm	A new testcase for guest debugging (gdbstub) that exposed a bunch of	2020-05-16 13:39:22 -07:00
lib	SPDX patches for 5.7-rc1.	2020-04-03 13:12:26 -07:00
math-emu	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2019-11-26 10:42:40 -08:00
mm	x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables	2020-05-19 19:30:28 +02:00
net	bpf, i386: Remove unneeded conversion to bool	2020-05-07 16:29:14 +02:00
oprofile	x86: Use pr_warn instead of pr_warning	2019-10-18 15:00:18 +02:00
pci	pci-v5.6-changes	2020-01-31 14:48:54 -08:00
platform	efi/x86: Don't remap text<->rodata gap read-only for mixed mode	2020-04-14 08:32:17 +02:00
power	x86/kernel: Convert to new CPU match macros	2020-03-24 21:28:26 +01:00
purgatory	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2019-11-26 10:42:40 -08:00
ras
realmode	SPDX patches for 5.7-rc1.	2020-04-03 13:12:26 -07:00
tools	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
um	mm/vma: define a default value for VM_DATA_DEFAULT_FLAGS	2020-04-10 15:36:21 -07:00
video
xen	x86: Fix early boot crash on gcc-10, third try	2020-05-15 11:48:01 +02:00
.gitignore	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
Kbuild
Kconfig	bpf: Restrict bpf_probe_read{, str}() only to archs where they work	2020-05-15 08:10:36 -07:00
Kconfig.assembler	x86: update AS_* macros to binutils >=2.23, supporting ADX and AVX2	2020-04-09 00:12:48 +09:00
Kconfig.cpu	x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs	2020-01-13 18:02:53 +01:00
Kconfig.debug	x86: mm: convert dump_pagetables to use walk_page_range	2020-02-04 03:05:25 +00:00
Makefile	x86: probe assembler capabilities via kconfig instead of makefile	2020-04-09 00:01:59 +09:00
Makefile_32.cpu	x86/math-emu: Limit MATH_EMULATION to 486SX compatibles	2019-10-03 10:51:17 +02:00
Makefile.um