linux-kernel - linux-next: manual merge of the ptrace tree with the s390 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: <20110720153320.a7f33784158ccb04fafcb5d6@canb.auug.org.au>
Date:	Wed, 20 Jul 2011 15:33:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Oleg Nesterov <oleg@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: linux-next: manual merge of the ptrace tree with the s390 tree

Hi all,

Today's linux-next merge of the ptrace tree got a conflict in
arch/s390/kernel/traps.c between commit 248bed4b0f3c ("[S390] use siginfo
for sigtrap signals") from the s390 tree and commit a288eecce525
("ptrace: kill trivial tracehooks") from the ptrace tree.

It looks like the former is a superset of the latter, so I used the
former.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped