Messages in this thread | | | Date | Tue, 13 Sep 2011 12:11:25 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the openrisc tree with Linus' tree |
| |
Hi Jonas,
Today's linux-next merge of the openrisc tree got a conflict in arch/openrisc/kernel/signal.c between commit d7cb66670905 ("openrisc: don't use pt_regs in struct sigcontext") from Linus' tree and commit ddf54eaa745b ("openrisc: don't use pt_regs in struct sigcontext") from the openrisc tree.
Two slightly differentl versions of the same change. I used the version in Linus' tree.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |