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

2013-01-11 Thread Will Deacon
On Fri, Jan 11, 2013 at 09:36:02AM +, Catalin Marinas wrote: > Hi Stephen, > > On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote: > > Today's linux-next merge of the signal tree got a conflict in > > arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64: > > compat:

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

2013-01-11 Thread Catalin Marinas
Hi Stephen, On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote: > Today's linux-next merge of the signal tree got a conflict in > arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64: > compat: include sa_restorer in old action from rt_sigaction") and > efed4d52e39f ("ar