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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sun, 28 Oct 2012 23:02:48 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	viro@...IV.linux.org.uk, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the signal tree with the sparc tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/