Skip to contentSkip to conversation

selinux: add Paul Moore as a SELinux maintainer

PATCH In review Paul Moore 3 participants 6 messages Sep 18, 2013 – Sep 24, 2013 SELinux security module

lore
Share & tools
lore

Paul Moore

author
#0 lore raw

PATCH 1/1 selinux: add Paul Moore as a SELinux maintainer

---
 MAINTAINERS |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
MAINTAINERS +2 -1
index e61c2e8..4fde706 100644
@@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
 M:	Stephen Smalley <[email protected]>
 M:	James Morris <[email protected]>
 M:	Eric Paris <[email protected]>
+M:	Paul Moore <[email protected]>
 L:	[email protected] (subscribers-only, general discussion)
 W:	http://selinuxproject.org
-T:	git git://git.infradead.org/users/eparis/selinux.git
+T:	git git://git.infradead.org/users/pcmoore/selinux
 S:	Supported
 F:	include/linux/selinux*
 F:	security/selinux/

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

Acked-by on v1 1/1
#1 lore raw

I do have comments about your tree itself. Namely, you are doing the same wrong broken thing that James does. Despite Linus telling him not to repeatedly. You pulled in some completely random -rc release without a really good reason (-rc is better than totally random, but still, it's junk).

You should have your tree based on an actual release unless there is a really good reason not to. If the person above you is going to have a merge conflict that is THEIR problem. You can/should be nice and check/explain how to solve the conflict, but hiding merge conflicts below the higher level maintainer is wrong. Linus has said this over and over. Although with some maintainers it falls on deaf ears. If there are a lot of them then it is possible the subsystem is not organized correctly and the situation should be evaluated why so many merge conflicts are happening.

My opinion, you should start your tree as 3.11 and rebase everything in my tree onto yours.

git checkout -b master
git reset --hard v3.11
git rebase --onto master 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 0b4bdb3573a86a88c829b9e4ad702859eb923e7e
git push -f $REPO master:master

As soon as 3.12 releases merge it into your tree and keep running. If there does end up being some actual requirement to merge James's tree or Linus' tree (aka patches you want to apply depend on patches in another tree) so be it, merge those changes. But if the only reason to merge another tree is to solve a conflict yourself or to 'have the latest and greatest' don't do it. Keep you tree based on a released 3.x as often as possible.

-Eric

Quoted 12 lines · Paul Moore
---
 MAINTAINERS |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
MAINTAINERS +0 -0
index e61c2e8..4fde706 100644
@@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
 M:	Stephen Smalley <[email protected]>

MAINTAINERS SELINUX SECURITY MODULE · line 7399

Quoted 10 lines
MAINTAINERS +2 -1
 M:	James Morris <[email protected]>
 M:	Eric Paris <[email protected]>
+M:	Paul Moore <[email protected]>
 L:	[email protected] (subscribers-only, general discussion)
 W:	http://selinuxproject.org
-T:	git git://git.infradead.org/users/eparis/selinux.git
+T:	git git://git.infradead.org/users/pcmoore/selinux
 S:	Supported
 F:	include/linux/selinux*
 F:	security/selinux/

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

author
#2 lore raw
Quoted 11 lines · Eric Paris

I do have comments about your tree itself. Namely, you are doing the same wrong broken thing that James does. Despite Linus telling him not to repeatedly. You pulled in some completely random -rc release without a really good reason (-rc is better than totally random, but still, it's junk).

You should have your tree based on an actual release unless there is a really good reason not to. If the person above you is going to have a merge conflict that is THEIR problem. You can/should be nice and check/explain how to solve the conflict, but hiding merge conflicts below the higher level maintainer is wrong ...

Okay, makes sense to me.

Quoted 9 lines

My opinion, you should start your tree as 3.11 and rebase everything in my tree onto yours.

git checkout -b master
git reset --hard v3.11
git rebase --onto master 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 0b4bdb3573a86a88c829b9e4ad702859eb923e7e
git push -f $REPO master:master

Quoted 7 lines

As soon as 3.12 releases merge it into your tree and keep running. If there does end up being some actual requirement to merge James's tree or Linus' tree (aka patches you want to apply depend on patches in another tree) so be it, merge those changes. But if the only reason to merge another tree is to solve a conflict yourself or to 'have the latest and greatest' don't do it. Keep you tree based on a released 3.x as often as possible.

I believe everything should be fixed now, take a look and if I've messed something up again, let me know.

Thanks,
-Paul

Signature · 8 lines
paul moore
security and virtualization @ redhat


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.
#3 lore raw
Quoted 2 lines · Paul Moore

I believe everything should be fixed now, take a look and if I've messed something up again, let me know.

You used merge instead of rebase, but either way is fine. Send an e-mail to [email protected] and ask him to pull your tree (be sure to tell him which branch) and to drop my tree. It should also go to [email protected] and cc me.

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

author
#4 lore raw
Quoted 5 lines · Eric Paris
Quoted 2 lines · Paul Moore

I believe everything should be fixed now, take a look and if I've messed something up again, let me know.

You used merge instead of rebase, but either way is fine.

I figured since there weren't really any patches in my tree at the moment it was just easier to start from scratch. Besides, I'm a simple person and your complex git commands scare me :)

Quoted 3 lines

Send an e-mail to [email protected] and ask him to pull your tree (be sure to tell him which branch) and to drop my tree. It should also go to [email protected] and cc me.

Will do, thanks.

Signature · 8 lines
paul moore
security and virtualization @ redhat


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.
#5 lore raw
In reply to Paul Moore
Quoted 12 lines · Paul Moore
---
 MAINTAINERS |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
MAINTAINERS +0 -0
index e61c2e8..4fde706 100644
@@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
 M:	Stephen Smalley <[email protected]>

MAINTAINERS SELINUX SECURITY MODULE · line 7399

Quoted 10 lines
MAINTAINERS +2 -1
 M:	James Morris <[email protected]>
 M:	Eric Paris <[email protected]>
+M:	Paul Moore <[email protected]>
 L:	[email protected] (subscribers-only, general discussion)
 W:	http://selinuxproject.org
-T:	git git://git.infradead.org/users/eparis/selinux.git
+T:	git git://git.infradead.org/users/pcmoore/selinux
 S:	Supported
 F:	include/linux/selinux*
 F:	security/selinux/

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next

Signature · 7 lines
James Morris
<[email protected]>

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.