lkml.org 
[lkml]   [2013]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the signal tree with the mips tree
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.

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).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-02 04:41    [W:0.027 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site