Messages in this thread | ![/](/images/icornerl.gif) | | Date | Fri, 12 Oct 2012 14:58:45 +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/frv/kernel/process.c between commit 2a5e5beb88c5 ("vfs: define struct filename and have getname() return it") from the vfs tree and commit 460dabab73f2 ("frv: switch to generic sys_execve()") from the signal tree.
The latter removed the function updated by the former, so I just did that and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |