git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 11 Apr 2017 06:56:05 +0000 (08:56 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 11 Apr 2017 06:56:05 +0000 (08:56 +0200)
commit	e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1
tree	07a09b5e19a4d55c4a097b280eb64bd159ca0eb9	tree
parent	b678c91aefa7ce05a5d195e0a5c7a357b62d3283	commit \| diff
parent	4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc	commit \| diff

Merge branch 'x86/boot' into x86/mm, to avoid conflict

There's a conflict between ongoing level-5 paging support and
the E820 rewrite. Since the E820 rewrite is essentially ready,
merge it into x86/mm to reduce tree conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

22 files changed:

arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/xen/page.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/bootparam.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/centaur.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kasan_init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pgtable_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/hibernate_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
tools/lguest/lguest.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/xen/page.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/bootparam.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/centaur.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kasan_init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pgtable_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/hibernate_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
tools/lguest/lguest.c	diff1 \|	diff2 \|	blob \| history