linux/arch/x86
Ingo Molnar ea2301b622 Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
Conflicts:
	arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-03-24 09:25:26 +01:00
..
boot Merge branch 'x86/mm' into x86/dma, to pick up dependencies 2018-03-20 10:01:37 +01:00
configs x86/unwind: Rename unwinder config options to 'CONFIG_UNWINDER_*' 2017-10-14 10:12:12 +02:00
crypto Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2018-02-12 08:57:21 -08:00
entry Merge branch 'x86/mm' into x86/dma, to pick up dependencies 2018-03-20 10:01:37 +01:00
events perf/x86/intel/uncore: Fix Skylake UPI event format 2018-03-04 09:59:00 +01:00
hyperv KVM changes for 4.16 2018-02-10 13:16:35 -08:00
ia32 x86/entry: Do not special-case clone(2) in compat entry 2018-03-07 07:57:31 +01:00
include Merge branch 'linus' into x86/dma, to resolve a conflict with upstream 2018-03-24 09:25:26 +01:00
kernel x86/dma: Remove dma_alloc_coherent_gfp_flags() 2018-03-20 10:01:58 +01:00
kvm kvm/x86: fix icebp instruction handling 2018-03-20 14:58:34 -07:00
lib Merge branch 'x86/pti' into x86/mm, to pick up dependencies 2018-03-12 12:10:03 +01:00
math-emu License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mm Merge branch 'linus' into x86/dma, to resolve a conflict with upstream 2018-03-24 09:25:26 +01:00
net bpf, x64: increase number of passes 2018-03-07 14:47:24 -08:00
oprofile x86/oprofile: Fix bogus GCC-8 warning in nmi_setup() 2018-02-21 09:54:17 +01:00
pci dma/direct: Handle the memory encryption bit in common code 2018-03-20 10:01:59 +01:00
platform Merge branch 'x86/urgent' into x86/mm to pick up dependencies 2018-03-14 20:23:25 +01:00
power x86/mm: Replace compile-time checks for 5-level paging with runtime-time checks 2018-02-16 10:48:49 +01:00
purgatory License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ras License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
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 x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk 2018-03-20 10:01:05 +01:00
video
xen Merge branch 'x86/urgent' into x86/mm to pick up dependencies 2018-03-14 20:23:25 +01:00
.gitignore x86/build: Add arch/x86/tools/insn_decoder_test to .gitignore 2018-02-13 14:10:29 +01:00
Kbuild
Kconfig dma/direct: Handle the memory encryption bit in common code 2018-03-20 10:01:59 +01:00
Kconfig.cpu Merge branch 'x86/mm' into x86/dma, to pick up dependencies 2018-03-20 10:01:37 +01: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 x86/build/64: Force the linker to use 2MB page size 2018-03-20 08:03:03 +01:00
Makefile_32.cpu License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Makefile.um License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00