Re: linux-next: manual merge of the signal tree with the modules tree

2013-03-17 Thread Rusty Russell
Sedat Dilek writes: > On Fri, Mar 15, 2013 at 5:41 AM, Rusty Russell wrote: >> Stephen Rothwell 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 mod

Re: linux-next: manual merge of the signal tree with the modules tree

2013-03-15 Thread Sedat Dilek
On Fri, Mar 15, 2013 at 11:21 AM, Sedat Dilek wrote: > On Fri, Mar 15, 2013 at 5:41 AM, Rusty Russell wrote: >> Stephen Rothwell 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_SYMB

Re: linux-next: manual merge of the signal tree with the modules tree

2013-03-15 Thread Sedat Dilek
On Fri, Mar 15, 2013 at 5:41 AM, Rusty Russell wrote: > Stephen Rothwell 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 >> e1b5b

Re: linux-next: manual merge of the signal tree with the modules tree

2013-03-14 Thread Rusty Russell
Stephen Rothwell 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 declaratio

Re: linux-next: manual merge of the signal tree with the modules tree

2013-03-14 Thread James Hogan
On 14/03/13 06:27, Stephen Rothwell wrote: > 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 SYSCAL