Subject: linux-next: manual merge of the livepatching tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 27 Mar 2015 18:30:35 +1100

Hi Jiri,

Today's linux-next merge of the livepatching tree got a conflict in
arch/s390/Kconfig between commit 5a79859ae0f3 ("s390: remove 31 bit
support") from the s390 tree and commit b8887ad66c1c ("livepatch: add
support on s390") from the livepatching tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/s390/Kconfig
index 1de26e1c48ac,eba9c1d0dab5..000000000000
--- a/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