David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
boot	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-20 11:28:32 -07:00
configs
crypto	crypto: x86/des3_ede - des3_ede_skciphers[] can be static	2018-03-09 22:45:53 +08:00
entry	x86/vdso: Remove unused file	2018-05-05 09:02:36 +02:00
events	perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr	2018-05-05 08:37:31 +02:00
hyperv	x86/hyper-v: allocate and use Virtual Processor Assist Pages	2018-03-28 22:47:06 +02:00
ia32	syscalls/x86: auto-create compat_sys_*() prototypes	2018-04-02 20:16:18 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
kernel	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-20 11:28:32 -07:00
kvm	KVM: X86: Lower the default timer frequency limit to 200us	2018-05-15 11:56:21 +02:00
lib	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-04-02 15:16:43 -07:00
math-emu
mm	x86/pkeys: Override pkey when moving away from PROT_EXEC	2018-05-14 11:14:45 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-07 23:35:08 -04:00
oprofile	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()	2018-02-21 09:54:17 +01:00
pci	Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-04-02 17:18:45 -07:00
platform	Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-04-02 17:46:37 -07:00
power	x86/power/64: Fix page-table setup for temporary text mapping	2018-04-20 11:52:00 +02:00
purgatory	kernel/kexec_file.c: move purgatories sha256 to common code	2018-04-13 17:10:28 -07:00
ras
realmode	x86-64/realmode: Add instruction suffix	2018-02-20 09:33:41 +01:00
tools	x86: Treat R_X86_64_PLT32 as R_X86_64_PC32	2018-02-22 09:01:10 -08:00
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2018-04-11 16:36:47 -07:00
video
xen	Some of the ftrace internal events use a zero for a data size of	2018-05-16 16:45:23 -07:00
.gitignore	x86/build: Add arch/x86/tools/insn_decoder_test to .gitignore	2018-02-13 14:10:29 +01:00
Kbuild
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-07 23:35:08 -04:00
Kconfig.cpu	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-03-25 07:36:02 -10:00
Kconfig.debug	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-30 13:01:09 -08:00
Makefile	Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-04-02 14:37:03 -07:00
Makefile_32.cpu
Makefile.um