linux-next: manual merge of the rcu tree with the powerpc-fixes tree

2017-03-07 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the rcu tree got a conflict in: arch/powerpc/Kconfig between commit: a7d2475af7ae ("powerpc: Sort the selects under CONFIG_PPC") from the powerpc-fixes tree and commit: 9252dd3a96a7 ("rcu: Make arch select smp_mb__after_unlock_lock() strength") from

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

2017-01-29 Thread Michael Ellerman
Stephen Rothwell writes: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > arch/powerpc/Kconfig > > between commit: > > f2574030b0e3 ("powerpc: Revert the initial stack protector support") > > from the powerpc-fixes tree and commit: > > c7327406b3c3 ("rcu: Make

linux-next: manual merge of the rcu tree with the powerpc-fixes tree

2017-01-29 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the rcu tree got a conflict in: arch/powerpc/Kconfig between commit: f2574030b0e3 ("powerpc: Revert the initial stack protector support") from the powerpc-fixes tree and commit: c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strengt