lkml.org 
[lkml]   [2013]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the signal tree with Linus' tree
Hi Al,

Today's linux-next merge of the signal tree got a conflict in
include/asm-generic/unistd.h between commit 4dd3c95940b8
("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from
Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and
SYSCALL_ALIAS declarations") from the signal tree.

I fixed it up (I used the signal tree version as I think it supersedes
the former) 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-03-04 03:21    [W:0.033 / U:1.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site