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

2013-03-11 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/mips/kernel/linux32.c between commit 63981a409608 ("MIPS: compat: Return same error ENOSYS as native for invalid operation") from the mips tree and commit 56e41d3c5aa8 ("merge compat sys_ipc instances") from the signal tree.

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

2013-02-03 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/mips/kernel/syscall.c between commit 7034228792cc ("MIPS: Whitespace cleanup") from the mips tree and commit 50150d2bb903 ("mips: switch to generic sys_fork() and sys_clone()") from the signal tree. I fixed it up (the sys_c

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

2013-01-01 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/mips/kernel/syscall.c between commit 12890d0f61fc ("MIPS: sysmips: Rewrite to use SYSCALL_DEFINE3()") from the mips tree and commit cc524ca3714b ("mips: kill sysmips() wrapper, switch to SYSCALL_DEFINE") from the signal tree