linux-next: manual merge of the ptrace tree with the s390 tree

Stephen Rothwell
2011-07-20T05:33:33Z

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]