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

2012-10-28 Thread David Miller
From: Stephen Rothwell Date: Mon, 29 Oct 2012 14:00:32 +1100 > Today's linux-next merge of the signal tree got a conflict in > arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64: > Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree > and commit 2f12af35a

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

2012-10-28 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree and commit 2f12af35a988 ("sparc64: switch to generic kernel_execve()") from the sig