linux-kernel - linux-next: manual merge of the signal tree with the arm64 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]

Date:	Fri, 11 Jan 2013 15:46:17 +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,
	Will Deacon <will.deacon@....com>,
	Catalin Marinas <catalin.marinas@....com>
Subject: linux-next: manual merge of the signal tree with the arm64 tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
compat: include sa_restorer in old action from rt_sigaction") and
efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
user structures") from the arm64 tree and various commits from the signal
tree.

The latter removes the code modified by the former, so I did that.

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

Content of type "application/pgp-signature" skipped