]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5d2313 8f3d9f3)
Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh
authorIngo Molnar <mingo@kernel.org>
Mon, 13 Apr 2020 07:44:39 +0000 (09:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 13 Apr 2020 07:44:39 +0000 (09:44 +0200)
commit3b02a051d25d9600e9d403ad3043aed7de00160e
tree5b8f58b79328c04654bf5ab6286401057edeca8ftree | snapshot
parentf5d2313bd3c540be405c4977a63840cd6d0167b5commit | diff
parent8f3d9f354286745c751374f5f1fcafee6b3f3136commit | diff
Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Resolve these conflicts:

arch/x86/Kconfig
arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
18 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/include/asm/bitops.h diff1 | diff2 | blob | history
arch/x86/kernel/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/compiler.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
init/init_task.c diff1 | diff2 | blob | history
init/main.c 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
tools/objtool/check.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.