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

2012-09-28 Thread Al Viro
On Fri, Sep 28, 2012 at 03:56:39PM +1000, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the signal tree got a conflict in fs/exec.c > between commit 5b8a94d461a7 ("coredump: move core dump functionality into > its own file") from the vfs tree and commits 70446600fa12 ("arm: >

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

2012-09-28 Thread Al Viro
On Fri, Sep 28, 2012 at 03:56:39PM +1000, Stephen Rothwell wrote: Hi Al, Today's linux-next merge of the signal tree got a conflict in fs/exec.c between commit 5b8a94d461a7 (coredump: move core dump functionality into its own file) from the vfs tree and commits 70446600fa12 (arm: introduce