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