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

Hi Ben, On Thu, 21 Feb 2013 14:43:49 -0600 Michael Neuling wrote: > > Benjamin Herrenschmidt wrote: > > > On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the signal tree got conflicts in > > > arch/powerpc/kernel/signal_32.c and arch/powerpc/k

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

Benjamin Herrenschmidt wrote: > On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote: > > Hi Al, > > > > Today's linux-next merge of the signal tree got conflicts in > > arch/powerpc/kernel/signal_32.c and arch/powerpc/kernel/signal_64.c > > between commit 2b0a576d15e0 ("powerpc: Add new tr

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

On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the signal tree got conflicts in > arch/powerpc/kernel/signal_32.c and arch/powerpc/kernel/signal_64.c > between commit 2b0a576d15e0 ("powerpc: Add new transactional memory state > to the signal con

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

Hi Al, Today's linux-next merge of the signal tree got conflicts in arch/powerpc/kernel/signal_32.c and arch/powerpc/kernel/signal_64.c between commit 2b0a576d15e0 ("powerpc: Add new transactional memory state to the signal context") from the powerpc tree and commit 7cce246557bf ("powerpc: switch