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 ret_from_kernel_execve(), switch to generic kernel_execve()") > and 5e41814a7d8b ("arm: get rid of execve wrapper, switch to generic > execve() implementation") from the signal tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > BTW, Al, you have that vfs tree commit (and others) authored by you ... Gyah... Will fix ASAP; sorry, guys. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html