Messages in this thread | | | Date | Fri, 14 Dec 2012 11:06:39 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the xtensa tree with Linus' tree |
| |
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in arch/xtensa/kernel/process.c between commit 3e41f9ba611c ("xtensa: switch to generic clone()") from Linus' tree and commit 8daa277ae436 ("xtensa: clean up files to make them code-style compliant") from the xtensa tree.
The former removes the function that is fixed up by the latter, so I just removed it 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] | |