From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the security-testing tree with Linus' tree
Date: Fri, 22 May 2009 06:35:42 +0100 [thread overview]
Message-ID: <20090522053542.GY8633@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20090522152901.2d220889.sfr@canb.auug.org.au>
On Fri, May 22, 2009 at 03:29:01PM +1000, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security-testing tree got a conflict in
> fs/exec.c between commits a44ddbb6d8a8ffe4e34e417048dfdd8f3dd1de4f ("Make
> open_exec() and sys_uselib() use may_open(), instead of duplicating its
> parts") and 6e8341a11eb21826b7192d0bb88cb5b44900a9af ("Switch open_exec()
> and sys_uselib() to do_open_filp()") from Linus' tree and commit
> b9fc745db833bbf74b4988493b8cd902a84c9415 ("integrity: path_check update")
> from the security-testing tree.
>
> I used the version of these conflicts from Linus' tree as I assume that
> the changes to may_open() from the latter patch are sufficient. Please
> check and let me know (or merge Linus' tree and do the resolution for
> yourself :-)).
Just drop their changes to sys_uselib() and open_exec() and keep the
rest of their patch.
next prev parent reply other threads:[~2009-05-22 5:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 5:29 linux-next: manual merge of the security-testing tree with Linus' tree Stephen Rothwell
2009-05-22 5:35 ` Al Viro [this message]
2009-05-22 9:04 ` James Morris
-- strict thread matches above, loose matches on Subject: below --
2011-05-16 3:02 Stephen Rothwell
2011-05-16 14:13 ` Serge Hallyn
2011-05-16 14:52 ` Stephen Rothwell
2010-05-06 2:30 Stephen Rothwell
2010-05-06 10:49 ` David Howells
2010-05-06 23:10 ` James Morris
2010-05-06 23:24 ` Justin P. Mattock
2009-02-06 7:23 Stephen Rothwell
2009-02-06 8:12 ` James Morris
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=20090522053542.GY8633@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zohar@linux.vnet.ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox