Subject: linux-next: manual merge of the crypto tree with the fsl tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 19 Jul 2016 11:03:47 +1000

Hi Herbert,

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

  arch/powerpc/Kconfig

between commit:

  c223c90386bc ("powerpc32: provide VIRT_CPU_ACCOUNTING")

from the fsl tree and commit:

  377ca89f0b37 ("powerpc: Add module autoloading based on CPU features")

from the crypto 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/Kconfig
index fcfe5332416f,174f1e8f9cac..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -165,7 -164,7 +165,8 @@@ config PP
  	select ARCH_HAS_UBSAN_SANITIZE_ALL
  	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
  	select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
 +	select HAVE_VIRT_CPU_ACCOUNTING
+ 	select GENERIC_CPU_AUTOPROBE
  
  config GENERIC_CSUM
  	def_bool CPU_LITTLE_ENDIAN