linux-kernel - linux-next: manual merge of the signal tree with Linus' 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>] [day] [month] [year] [list]

Message-Id: <20120821145742.8f4640e49ef079d83dfe0ba4@canb.auug.org.au>
Date:	Tue, 21 Aug 2012 14:57:42 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Michael Cree <mcree@...on.net.nz>,
	Matt Turner <mattst88@...il.com>
Subject: linux-next: manual merge of the signal tree with Linus' tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/alpha/kernel/process.c between commit 28d353d9891c ("alpha: take
kernel_execve() out of entry.S") from Linus' tree and commit 68f596a7a045
("alpha: rewrite kernel_execve in C") from the signal tree.

These appear to be the same patch with a slight difference in this file.
I just used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped