linux-next: manual merge of the kspp tree with the powerpc tree

linux-next: manual merge of the kspp tree with the powerpc tree

[Stephen Rothwell]

Hi Kees,

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

  arch/powerpc/Kconfig

between commit:

  c223c90386bc ("powerpc32: provide VIRT_CPU_ACCOUNTING")

from the powerpc tree and commit:

  006d998dda94 ("powerpc/uaccess: Enable hardened usercopy")

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

Michael: time to sort these selects?
-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/Kconfig
index fcfe5332416f,b7a18b2604be..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 HAVE_ARCH_HARDENED_USERCOPY
  
  config GENERIC_CSUM
  	def_bool CPU_LITTLE_ENDIAN

Re: linux-next: manual merge of the kspp tree with the powerpc tree

[Stephen Rothwell]

Hi Michael,

On Mon, 18 Jul 2016 21:00:05 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > from the powerpc tree and commit:  
> 
> Actually that's in Scott's tree.

Oops, sorry.

> > Michael: time to sort these selects?  
> 
> Yeah I was thinking that the other day. Not sure when is a good time though.

Just after -rc1, before you open the powerpc tree up again so most of
the powerpc patches can be based after it.  Also a good time to update
the config files if necessary.

-- 
Cheers,
Stephen Rothwell