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

Hello Stephen, On Mon, Nov 05, 2012 at 03:03:07PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the signal tree got a conflict in > arch/arm/kernel/process.c between commit 77a3018e38b9 ("Cortex-M3: Add > support for exception handling") from the cortex tree and commit > 9e647993002

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

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/arm/kernel/process.c between commit 77a3018e38b9 ("Cortex-M3: Add support for exception handling") from the cortex tree and commit 9e6479930021 ("arm: switch to generic fork/vfork/clone") from the signal tree. I fixed it up