From: James Morris <jmorris@namei.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Moore <pmoore@redhat.com>,
LSM List <linux-security-module@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [GIT] Security subsystem upate for 3.18
Date: Mon, 13 Oct 2014 15:06:34 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.11.1410131502510.6957@namei.org> (raw)
In-Reply-To: <CA+55aFxtxBe8SaEYD6vAQME_YE+eD6mhU8F6Q850k-XBfzz4QQ@mail.gmail.com>
On Sun, 12 Oct 2014, Linus Torvalds wrote:
> on some previous development, so it's often a good time to simply
> create a new feature branch. I don't know how James feels about
> merging multiple separate feature branches, but I know that *I* tend
> to appreciate it when I get multiple well-defined pull requests rather
> than one big one that does many different things.
It's fine with me.
This is the first time I saw (or noticed) that Paul had back merged ahead
of me, but it seemed to merge into my tree ok so I didn't query it at the
time.
Paul: it's likey best if you consider my -next branch as your upstream.
I'll sync to Linus on point releases as previously discussed.
Linus: sorry about all of this, and I'll ensure there's always a summary
of the changes and a correct subject for you.
--
James Morris
<jmorris@namei.org>
next prev parent reply other threads:[~2014-10-13 4:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 8:23 [GIT] Security subsystem upate for 3.18 James Morris
2014-10-12 14:12 ` Linus Torvalds
2014-10-12 14:32 ` Linus Torvalds
2014-10-12 15:04 ` Paul Moore
2014-10-12 15:50 ` Linus Torvalds
2014-10-12 16:01 ` Linus Torvalds
2014-10-13 4:06 ` James Morris [this message]
2014-10-13 13:07 ` Paul Moore
2014-10-14 11:01 ` James Morris
2014-10-12 21:19 ` Paul Moore
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=alpine.LRH.2.11.1410131502510.6957@namei.org \
--to=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=pmoore@redhat.com \
--cc=sfr@canb.auug.org.au \
--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.