linux-kernel - linux-next: manual merge of the signal tree with the sh 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: <20120919152130.dc856a602341c98b6ec93778@canb.auug.org.au>
Date:	Wed, 19 Sep 2012 15:21:30 +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,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the signal tree with the sh tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/sh/kernel/cpu/sh5/entry.S arch/sh/kernel/entry-common.S between
commit 5e071e2b4b82 ("sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING
handling") from the sh tree and commit 52b8a6e18bfd ("sh: missing tests
for NOTIFY_RESUME") from the signal tree.

These appear to be the same patches (apart from some trivial bits), so I
used the one from the sh tree 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