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

2012-10-15 Thread Uwe Kleine-König
On Tue, Oct 16, 2012 at 01:20:52PM +1100, Stephen Rothwell wrote: > Hi Uwe, > > Today's linux-next merge of the cortex tree got a conflict in > arch/arm/kernel/process.c between commit 9e14f828ee4a ("arm: split > ret_from_fork, simplify kernel_thread() [based on patch by rmk]") from > Linus' tree

linux-next: manual merge of the cortex tree with Linus' tree

2012-10-15 Thread Stephen Rothwell
Hi Uwe, Today's linux-next merge of the cortex tree got a conflict in arch/arm/kernel/process.c between commit 9e14f828ee4a ("arm: split ret_from_fork, simplify kernel_thread() [based on patch by rmk]") from Linus' tree and commit 2f3e7d3436cb ("Cortex-M3: Add support for exception handling") from

linux-next: manual merge of the cortex tree with Linus' tree

2012-10-15 Thread Stephen Rothwell
Hi Uwe, Today's linux-next merge of the cortex tree got a conflict in arch/arm/include/asm/ptrace.h between commit cb8db5d4578a ("UAPI: (Scripted) Disintegrate arch/arm/include/asm") from Linus' tree and commit 69bc3631744a ("Cortex-M3: Add base support for Cortex-M3") from the cortex tree. I fix