From: Paul Moore <pmoore@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: empty commit in the security tree
Date: Mon, 24 Mar 2014 08:11:50 -0400 [thread overview]
Message-ID: <2288468.3EeUVpQZvb@sifl> (raw)
In-Reply-To: <20140321092541.77ae84b831cc71b1318d6f12@canb.auug.org.au>
On Friday, March 21, 2014 09:25:41 AM Stephen Rothwell wrote:
> Hi James,
>
> I noticed this commit in the security tree this morning:
>
> commit 2c5f5c9a1d1b3559cbbda8e014706eb359566c00
> Author: Paul Moore <pmoore@redhat.com>
> Date: Wed Mar 19 16:46:04 2014 -0400
>
> selinux: fix the output of ./scripts/get_maintainer.pl for SELinux
>
> It has no changes, just a commit message. Did something go missing?
If I remember correctly James merged this patch into his security tree after I
had applied it to the SELinux tree but before the SELinux tree was pulled into
the security tree. There was also some "differences in process" (see the LSM
archives if you're interested) when it came to pulling the SELinux tree into
the security tree, the end result is what you are seeing now. The differences
should be fixed going forward as James' has agreed to start merging regular
releases (e.g. 3.14, 3.15, 3.16, ...) into the security tree so this shouldn't
happen again.
The good news for this particular patch is that it *is* applied to the
security tree, this duplicate/empty entry can be ignored. I'm sorry for the
confusion.
-Paul
--
paul moore
security and virtualization @ redhat
prev parent reply other threads:[~2014-03-24 12:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 22:25 linux-next: empty commit in the security tree Stephen Rothwell
2014-03-24 12:11 ` 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=2288468.3EeUVpQZvb@sifl \
--to=pmoore@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).