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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 90c00f3 a215925)

author	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:23:40 +0000 (09:23 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 21 Mar 2020 08:24:41 +0000 (09:24 +0100)
commit	04184cc840a9a18980a20b0029a0256d152bf137
tree	1b9970b520d7bc7176cc9460fe67f210be5ea181	tree \| snapshot
parent	90c00f38c9ca814421db73b5bad8de73893d5619	commit \| diff
parent	a215925a870d5290cb2ea638d2fb7abaabf202f7	commit \| diff

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Conflicts:
arch/x86/purgatory/Makefile

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

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/vdso/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/purgatory/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/realmode/rm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/firmware/efi/libstub/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
mm/Makefile	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.