Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 30 Dec 2019 07:10:51 +0000 (08:10 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 30 Dec 2019 07:10:51 +0000 (08:10 +0100)
commit28336be568bb473d16ba80db0801276fb4f1bbe5
treecf2d7a56e6c3ea08139d8d9a5a58b296bd172136
parent5cbaefe9743bf14c9d3106db0cc19f8cb0a3ca22
parentfd6988496e79a6a4bdb514a4655d2920209eb85d
Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Conflicts:
init/main.c
lib/Kconfig.debug

Signed-off-by: Ingo Molnar <mingo@kernel.org>
20 files changed:
Documentation/dev-tools/index.rst
MAINTAINERS
Makefile
arch/x86/Kconfig
arch/x86/boot/Makefile
arch/x86/boot/compressed/Makefile
arch/x86/entry/vdso/Makefile
arch/x86/include/asm/bitops.h
arch/x86/kernel/Makefile
arch/x86/mm/Makefile
drivers/firmware/efi/libstub/Makefile
include/linux/sched.h
include/linux/seqlock.h
init/main.c
kernel/Makefile
lib/Kconfig.debug
lib/Makefile
mm/Makefile
scripts/Makefile.lib
tools/objtool/check.c