From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Morris <james.l.morris@oracle.com>,
"Serge E. Hallyn" <serge@hallyn.com>
Subject: Re: linux-next: the selinux tree needs cleaning up
Date: Wed, 25 Jun 2014 10:14:23 -0400 [thread overview]
Message-ID: <3104278.9BN09dqLoQ@sifl> (raw)
In-Reply-To: <20140625095928.3161ebe1@canb.auug.org.au>
On Wednesday, June 25, 2014 09:59:28 AM Stephen Rothwell wrote:
> Well, I see that James has pulled your tree, so past problems are now
> moot. He has some duplicate commits in his tree now and Linus will get
> a few more when he next pulls James' tree. We just need to avoid this
> going forward. And given that James or Serge will, from now on, *pull*
> your tree (not cherry-pick from it), things should be fine.
Okay, sorry again for the confusion, hopefully we won't have to worry about
this again.
--
paul moore
www.paul-moore.com
prev parent reply other threads:[~2014-06-25 14:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 22:40 linux-next: the selinux tree needs cleaning up Stephen Rothwell
2014-06-18 18:26 ` Paul Moore
2014-06-19 15:08 ` Stephen Rothwell
2014-06-19 19:47 ` Paul Moore
2014-06-19 22:59 ` Stephen Rothwell
2014-06-20 3:43 ` Serge E. Hallyn
2014-06-20 3:59 ` Stephen Rothwell
2014-06-20 14:57 ` Serge E. Hallyn
2014-06-20 16:06 ` Paul Moore
2014-06-24 18:03 ` Paul Moore
2014-06-24 23:59 ` Stephen Rothwell
2014-06-25 10:51 ` James Morris
2014-06-25 22:12 ` Stephen Rothwell
2014-06-27 2:41 ` James Morris
2014-06-25 14:14 ` Paul Moore [this message]
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=3104278.9BN09dqLoQ@sifl \
--to=paul@paul-moore.com \
--cc=james.l.morris@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=serge@hallyn.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox