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

[Michael Ellerman]

Stephen Rothwell <sfr at canb.auug.org.au> writes:

> 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:

Actually that's in Scott's tree.

I didn't love it, but I guess it's OK to go in.

>   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?

Yeah I was thinking that the other day. Not sure when is a good time though.

cheers