Messages in this thread | | | Date | Mon, 4 Mar 2013 13:03:33 +1100 | From | Stephen Rothwell <> | Subject | linux-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] | |