Messages in this thread | | | Date | Fri, 12 Oct 2012 15:09:16 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the signal tree with the vfs tree |
| |
Hi Al,
Today's linux-next merge of the signal tree got a conflict in arch/powerpc/kernel/sys_ppc32.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 removed removed the function that was modified by the former, so I did that and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |