linux-next: manual merge of the signal tree with the mips tree
From: Stephen Rothwell
Date: Tue Jan 01 2013 - 22:18:46 EST
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.
These patches are doing the same thing. I fixed it up (using the mips
tree version, which no longer passes regs to mips_atomic_set()) and can
carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature