Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/c6x/kernel/process.c between commit 2a5e5beb88c5 ("vfs: define struct filename and have getname() return it") from the vfs tree and commit 680a14535c33 ("c6x: switch to generic sys_execve") from the signal tree. The latter removes the function modified by the former so I did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpBeluWkOWtl.pgp
Description: PGP signature