* linux-next: empty commit in the security tree
@ 2014-03-20 22:25 Stephen Rothwell
2014-03-24 12:11 ` Paul Moore
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-03-20 22:25 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, Paul Moore
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
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?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: empty commit in the security tree
2014-03-20 22:25 linux-next: empty commit in the security tree Stephen Rothwell
@ 2014-03-24 12:11 ` Paul Moore
0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2014-03-24 12:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-24 12:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-20 22:25 linux-next: empty commit in the security tree Stephen Rothwell
2014-03-24 12:11 ` Paul Moore
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).