git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:53:06 +0000 (10:53 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:53:06 +0000 (10:53 +0100)
commit	ca09856d1b17d14e4e3138f8194be8fa610fe2d9
tree	af222e53d833ff7218577cf98e1b856d9d6bda93	tree \| snapshot
parent	88f374281c90c7972c3a9e7b10db0d055f6ade0b	commit \| diff
parent	dc72ab68170a2b2b09a96b3c63f5d3392e7ffa2f	commit \| diff

Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts

Conflicts:
arch/x86/kernel/cpu/Makefile

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

40 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/calling.h	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64_compat.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/bitops.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/module.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/rmwcc.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/switch_to.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/trace/fpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/traps.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unwind.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/processor-flags.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vm86_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kasan_init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/smp_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-asm_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-head.S	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmzone.h	diff1 \|	diff2 \|	blob \| history
mm/sparse.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.build	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/calling.h	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64_compat.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/bitops.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/module.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/rmwcc.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/switch_to.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/trace/fpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/traps.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/unwind.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/processor-flags.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vm86_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kasan_init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/smp_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-asm_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-head.S	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/mmzone.h	diff1 \|	diff2 \|	blob \| history
mm/sparse.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.build	diff1 \|	diff2 \|	blob \| history