Messages in this thread | | | From | Rusty Russell <> | Subject | Re: linux-next: manual merge of the signal tree with the modules tree | Date | Fri, 15 Mar 2013 15:11:53 +1030 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Al, > > Today's linux-next merge of the signal tree got a conflict in > include/asm-generic/unistd.h between commit 837718bfd28b > ("CONFIG_SYMBOL_PREFIX: cleanup") from the modules tree and commit > e1b5bb6d1236 ("consolidate cond_syscall and SYSCALL_ALIAS declarations") > from the signal tree. > > The latter moved the cond_syscall stuff to linkage.h, so I applied the > following patch as a merge fixup and can carry the fix as necessary (no > action is required). I am not sure if this is completely correct or all > that is needed.
Your fix looks correct, thanks.
I've been forced to update that patch after another round of improvements, so you may need to re-do the merge.
Cheers, Rusty.
| |