From: ebiederm@xmission.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: James Morris <jmorris@namei.org>,
LSM List <linux-security-module@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>
Subject: Re: [GIT] Security subsystem updates for 3.8
Date: Sun, 16 Dec 2012 20:01:14 -0800 [thread overview]
Message-ID: <8738z5nx85.fsf@xmission.com> (raw)
In-Reply-To: <CA+55aFxxC8xpG9KQtqxRfcJzCu58Fv711bTwtKFq3HHAvRhYBA@mail.gmail.com> (Linus Torvalds's message of "Sun, 16 Dec 2012 15:51:05 -0800")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Sat, Dec 15, 2012 at 12:28 AM, James Morris <jmorris@namei.org> wrote:
>> A quiet cycle for the security subsystem with just a few maintenance
>> updates.
>
> Ok, pulled. There were a few trivial conflicts (mostly due to some of
> the key allocation patches having already been merged, and some of the
> kuid/kgid changes due to the userns changes).
>
> I'd like you to double-check the end result, but it *looks* fine.
> Adding both EricB and DavidH to the participants since the conflicts
> were generally due to intetractions with their patches.
I just read through the conflict resolution and I don't see any
kuid/kgid problems. I am surprised that there were any kuid/kgid
conflicts as all of my changes in that area were in 3.6-rc1.
Eric
next prev parent reply other threads:[~2012-12-17 4:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-15 8:28 [GIT] Security subsystem updates for 3.8 James Morris
2012-12-16 23:51 ` Linus Torvalds
2012-12-17 4:01 ` Eric W. Biederman [this message]
2012-12-17 12:52 ` David Howells
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=8738z5nx85.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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.