Merge remote-tracking branch 'livepatching/for-next'

Conflicts:
	arch/s390/Kconfig

diff --cc arch/s390/Kconfig
index 1de26e1c48ac350cae32265840401328151ca527,eba9c1d0dab56e2dc6027aaefb2d097c71911d06..4bdca5e5864246d8bd42b1c9ad2d647915b7b696
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -132,7 -132,8 +132,8 @@@ config S39
        select HAVE_KERNEL_XZ
        select HAVE_KPROBES
        select HAVE_KRETPROBES
 -      select HAVE_KVM if 64BIT
 +      select HAVE_KVM
+       select HAVE_LIVEPATCH
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MEMBLOCK_PHYS_MAP