Re: linux-next: manual merge of the signal tree with the sparc tree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 29 Oct 2012 14:00:32 +1100

> Today's linux-next merge of the signal tree got a conflict in
> arch/sparc/kernel/sys_sparc_64.c between commit 517ffce4e1a0 ("sparc64:
> Make montmul/montsqr/mpmul usable in 32-bit threads") from the sparc tree
> and commit 2f12af35a988 ("sparc64: switch to generic kernel_execve()")
> from the signal tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I intend to pull the sparc tree into sparc-next, then pull the sparc
branch from Al's tree into sparc-next to fix this up.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/