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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130304130333.96ae5a2f223cca784bd1aa82@canb.auug.org.au>
Date:	Mon, 4 Mar 2013 13:03:33 +1100
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,
	James Hogan <james.hogan@...tec.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
include/asm-generic/unistd.h between commit 4dd3c95940b8
("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from
Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and
SYSCALL_ALIAS declarations") from the signal tree.

I fixed it up (I used the signal tree version as I think it supersedes
the former) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped