From: Tejun Heo <tj@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Oleg Nesterov <oleg@redhat•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Subject: Re: linux-next: manual merge of the ptrace tree with the s390 tree
Date: Thu, 21 Jul 2011 10:02:40 +0200 [thread overview]
Message-ID: <20110721080240.GZ3455@htj.dyndns.org> (raw)
In-Reply-To: <20110720153320.a7f33784158ccb04fafcb5d6@canb.auug.org.au>
Hello,
On Wed, Jul 20, 2011 at 03:33:20PM +1000, Stephen Rothwell wrote:
> 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.
Yeap, pretty much. Martin, testing if (current->ptrace) is enough.
If PT_PTRACED is not set, no other flag there is allowed to set.
Also, I think we really should standardize what gets reported in these
debug traps instead of letting each arch do its own thing.
Thanks.
--
tejun
next prev parent reply other threads:[~2011-07-21 8:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-20 5:33 linux-next: manual merge of the ptrace tree with the s390 tree Stephen Rothwell
2011-07-21 8:02 ` Tejun Heo [this message]
2011-07-21 14:44 ` Oleg Nesterov
2011-07-22 8:06 ` Tejun Heo
2011-07-22 8:29 ` Martin Schwidefsky
2011-07-22 8:48 ` Tejun Heo
2011-07-22 14:49 ` Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110721080240.GZ3455@htj.dyndns.org \
--to=tj@kernel$(echo .)org \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=oleg@redhat$(echo .)com \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox