From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mimi Zohar <zohar@linux•vnet.ibm.com>,
Al Viro <viro@zeniv•linux.org.uk>
Subject: linux-next: manual merge of the security-testing tree with Linus' tree
Date: Fri, 22 May 2009 15:29:01 +1000 [thread overview]
Message-ID: <20090522152901.2d220889.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
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 :-)).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-05-22 5:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 5:29 Stephen Rothwell [this message]
2009-05-22 5:35 ` linux-next: manual merge of the security-testing tree with Linus' tree Al Viro
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=20090522152901.2d220889.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jmorris@namei$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/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