From: James Morris <jmorris@namei.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Eric Paris <eparis@redhat.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
Paul Moore <paul.moore@hp.com>,
linux-next@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the selinux tree
Date: Tue, 8 Jul 2008 00:43:56 +1000 (EST) [thread overview]
Message-ID: <Xine.LNX.4.64.0807080042090.11950@us.intercode.com.au> (raw)
In-Reply-To: <20080707225130.ca52d527.sfr@canb.auug.org.au>
On Mon, 7 Jul 2008, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the selinux tree got a conflict in
> fs/proc/task_mmu.c between commit
> 5d7e0d2bd98ef4f5a16ac9da1987ae655368dd6a ("Fix pagemap_read() use of
> struct mm_walk") from Linus' tree and commit
> ca9b1a1413bac6ea5e5c8cb81044a39bdb3b4bc8 ("Security: split proc ptrace
> checking into read vs. attach") from the selinux tree.
>
> The former removed some of the code that the latter changed. It is
> probably worth a check on the code in pagemap_read to make sure I got it
> right.
I couldn't locate your updated version, but have resolved it in my own
tree (which is being rebased).
One thing we need to understand is why there were two separate
ptrace_may_attach() calls in the earlier version of pagemap_read().
- James
--
James Morris
<jmorris@namei.org>
next prev parent reply other threads:[~2008-07-07 14:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-07 12:51 linux-next: manual merge of the selinux tree Stephen Rothwell
2008-07-07 14:43 ` James Morris [this message]
2008-07-07 14:47 ` Stephen Smalley
2008-07-08 8:49 ` Andrew Morton
2008-07-08 12:19 ` Stephen Smalley
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=Xine.LNX.4.64.0807080042090.11950@us.intercode.com.au \
--to=jmorris@namei.org \
--cc=akpm@linux-foundation.org \
--cc=eparis@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=paul.moore@hp.com \
--cc=sds@tycho.nsa.gov \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.