From: Eric Paris <eparis@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Howells <dhowells@redhat.com>,
James Morris <jmorris@namei.org>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the creds tree
Date: Fri, 31 Oct 2008 17:32:34 -0400 [thread overview]
Message-ID: <1225488754.3371.2.camel@localhost.localdomain> (raw)
In-Reply-To: <20081031170609.a3fcda4e.sfr@canb.auug.org.au>
On Fri, 2008-10-31 at 17:06 +1100, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the creds tree got a conflict in
> security/selinux/hooks.c between commit
> 8b6a5a37f87a414ef8636e36ec75accb27bb7508 ("SELinux: check open perms in
> dentry_open not inode_permission") from the security-testing tree and
> commits 7113316bdf8c9f91df7bd68ab739d9bd0f5e8efc ("CRED: Make
> inode_has_perm() and file_has_perm() take a cred pointer") and
> a9018998dcc1e3b4401a7f6d2050ffedbd1b64da ("CRED: Inaugurate COW
> credentials") from the creds tree.
>
> Overlapping changes. I fixed it up (see below) and can carry the fix.
ACK Looks good to me, thanks.
next prev parent reply other threads:[~2008-10-31 21:33 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-31 6:06 linux-next: manual merge of the creds tree Stephen Rothwell
2008-10-31 9:16 ` David Howells
2008-10-31 21:32 ` Eric Paris [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-13 5:24 Stephen Rothwell
2008-11-13 12:33 ` David Howells
2008-11-13 12:45 ` Stephen Rothwell
2008-11-13 14:46 ` Serge E. Hallyn
2008-11-13 5:19 Stephen Rothwell
2008-11-13 5:09 Stephen Rothwell
2008-11-12 5:30 Stephen Rothwell
2008-11-12 18:23 ` David Howells
2008-11-12 22:32 ` Stephen Rothwell
2008-11-12 5:22 Stephen Rothwell
2008-11-07 7:49 Stephen Rothwell
2008-11-07 15:04 ` David Howells
2008-11-05 4:56 Stephen Rothwell
2008-11-05 12:08 ` David Howells
2008-11-05 23:19 ` James Morris
2008-11-06 11:13 ` David Howells
2008-10-31 5:56 Stephen Rothwell
2008-10-31 10:37 ` David Howells
2008-10-31 5:47 Stephen Rothwell
2008-10-31 9:03 ` David Howells
2008-10-31 16:54 ` Eric Sandeen
2008-10-30 4:47 Stephen Rothwell
2008-10-30 8:03 ` Christoph Hellwig
2008-10-30 10:14 ` David Howells
2008-10-30 10:16 ` Christoph Hellwig
2008-10-30 12:31 ` David Howells
2008-10-31 0:55 ` Lachlan McIlroy
2008-10-31 2:49 ` Stephen Rothwell
2008-10-31 9:02 ` David Howells
2008-10-30 10:14 ` David Howells
2008-12-29 4:06 ` Stephen Rothwell
2008-10-21 6:07 Stephen Rothwell
2008-10-21 14:30 ` David Howells
2008-10-20 8:18 Stephen Rothwell
2008-10-20 11:55 ` David Howells
2008-10-17 6:13 Stephen Rothwell
2008-10-17 10:34 ` David Howells
2008-10-17 10:38 ` Kirill A. Shutemov
2008-10-17 6:08 Stephen Rothwell
2008-10-17 10:34 ` David Howells
2008-10-15 10:12 Stephen Rothwell
2008-10-15 12:00 ` David Howells
2008-10-15 10:05 Stephen Rothwell
2008-10-15 11:52 ` David Howells
2008-10-15 10:00 Stephen Rothwell
2008-10-15 12:02 ` David Howells
2008-10-15 9:55 Stephen Rothwell
2008-10-15 12:02 ` David Howells
2008-10-16 7:33 ` Stephen Rothwell
2008-10-15 9:48 Stephen Rothwell
2008-10-15 12:00 ` David Howells
2008-08-29 8:14 Stephen Rothwell
2008-08-29 8:56 ` James Morris
2008-08-29 10:18 ` David Howells
2008-08-28 6:42 Stephen Rothwell
2008-08-27 6:59 Stephen Rothwell
2008-08-18 6:33 Stephen Rothwell
2008-08-18 6:37 ` Stephen Rothwell
2008-08-15 7:38 Stephen Rothwell
2008-08-14 5:59 Stephen Rothwell
2008-08-12 7:13 Stephen Rothwell
2008-08-12 7:09 Stephen Rothwell
2008-08-08 6:08 Stephen Rothwell
2008-08-08 7:29 ` David Howells
2008-08-08 9:23 ` James Morris
2008-08-10 12:53 ` Stephen Rothwell
2008-08-10 13:23 ` Stephen Rothwell
2008-08-08 6:01 Stephen Rothwell
2008-08-08 6:03 ` Stephen Rothwell
2008-08-08 11:41 ` Jeff Layton
2008-08-08 15:25 ` Steve French
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=1225488754.3371.2.camel@localhost.localdomain \
--to=eparis@redhat.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-next@vger.kernel.org \
--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.