Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/md/bcache/super.c
Simple merge

diff --cc include/linux/compiler_types.h
Simple merge

diff --cc include/linux/mod_devicetable.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/tests/Makefile
Simple merge

diff --cc scripts/Makefile.extrawarn
Simple merge

diff --cc scripts/Makefile.gcc-plugins
Simple merge

diff --cc scripts/Makefile.ubsan
Simple merge

diff --cc scripts/gcc-plugins/Kconfig
Simple merge

diff --cc security/Kconfig.hardening
Simple merge