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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 18 Apr 2016 14:23:23 +1000

Hi Jiri,

Today's linux-next merge of the livepatching tree got a conflict in:

  arch/powerpc/Kconfig

between commit:

  7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")

from Linus' tree and commit:

  85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")

from the livepatching tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Maybe the selects under config PPC should be sorted ...

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/Kconfig
index fbebde0771c8,944a79a2768f..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -159,7 -159,7 +159,8 @@@ config PP
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
  	select HAVE_ARCH_SECCOMP_FILTER
  	select ARCH_HAS_UBSAN_SANITIZE_ALL
 +	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
+ 	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
  
  config GENERIC_CSUM
  	def_bool CPU_LITTLE_ENDIAN