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

Hi Michael, On Mon, 18 Jul 2016 21:00:05 +1000 Michael Ellerman wrote: > > Stephen Rothwell 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 whe

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

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 i