* [PATCH] selinux: add Paul Moore as a SELinux maintainer
@ 2013-09-18 17:14 Paul Moore
2013-09-18 17:22 ` Eric Paris
2013-09-24 1:47 ` James Morris
0 siblings, 2 replies; 6+ messages in thread
From: Paul Moore @ 2013-09-18 17:14 UTC (permalink / raw)
To: eparis, selinux
Signed-off-by: Paul Moore <paul@paul-moore.com>
---
MAINTAINERS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index e61c2e8..4fde706 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
M: Stephen Smalley <sds@tycho.nsa.gov>
M: James Morris <james.l.morris@oracle.com>
M: Eric Paris <eparis@parisplace.org>
+M: Paul Moore <paul@paul-moore.com>
L: selinux@tycho.nsa.gov (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 majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
2013-09-18 17:14 [PATCH] selinux: add Paul Moore as a SELinux maintainer Paul Moore
@ 2013-09-18 17:22 ` Eric Paris
2013-09-18 18:05 ` Paul Moore
2013-09-24 1:47 ` James Morris
1 sibling, 1 reply; 6+ messages in thread
From: Eric Paris @ 2013-09-18 17:22 UTC (permalink / raw)
To: Paul Moore; +Cc: selinux
Acked-by: Eric Paris <eparis@redhat.com>
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
On Wed, 2013-09-18 at 13:14 -0400, Paul Moore wrote:
> Signed-off-by: Paul Moore <paul@paul-moore.com>
> ---
> MAINTAINERS | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e61c2e8..4fde706 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
> M: Stephen Smalley <sds@tycho.nsa.gov>
> M: James Morris <james.l.morris@oracle.com>
> M: Eric Paris <eparis@parisplace.org>
> +M: Paul Moore <paul@paul-moore.com>
> L: selinux@tycho.nsa.gov (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 majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
2013-09-18 17:22 ` Eric Paris
@ 2013-09-18 18:05 ` Paul Moore
2013-09-18 18:09 ` Eric Paris
0 siblings, 1 reply; 6+ messages in thread
From: Paul Moore @ 2013-09-18 18:05 UTC (permalink / raw)
To: Eric Paris; +Cc: selinux
On Wednesday, September 18, 2013 01:22:59 PM Eric Paris wrote:
> 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.
> 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.
I believe everything should be fixed now, take a look and if I've messed
something up again, let me know.
Thanks,
-Paul
--
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 majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
2013-09-18 18:05 ` Paul Moore
@ 2013-09-18 18:09 ` Eric Paris
2013-09-18 18:12 ` Paul Moore
0 siblings, 1 reply; 6+ messages in thread
From: Eric Paris @ 2013-09-18 18:09 UTC (permalink / raw)
To: Paul Moore; +Cc: selinux
On Wed, 2013-09-18 at 14:05 -0400, Paul Moore wrote:
> 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 sfr@canb.auug.org and ask him to pull your tree (be sure to
tell him which branch) and to drop my tree. It should also go to
linux-next@vger.kernel.org and cc me.
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
2013-09-18 18:09 ` Eric Paris
@ 2013-09-18 18:12 ` Paul Moore
0 siblings, 0 replies; 6+ messages in thread
From: Paul Moore @ 2013-09-18 18:12 UTC (permalink / raw)
To: Eric Paris; +Cc: selinux
On Wednesday, September 18, 2013 02:09:36 PM Eric Paris wrote:
> On Wed, 2013-09-18 at 14:05 -0400, Paul Moore wrote:
> > 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 :)
> Send an e-mail to sfr@canb.auug.org and ask him to pull your tree (be sure
> to tell him which branch) and to drop my tree. It should also go to
> linux-next@vger.kernel.org and cc me.
Will do, thanks.
--
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 majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
2013-09-18 17:14 [PATCH] selinux: add Paul Moore as a SELinux maintainer Paul Moore
2013-09-18 17:22 ` Eric Paris
@ 2013-09-24 1:47 ` James Morris
1 sibling, 0 replies; 6+ messages in thread
From: James Morris @ 2013-09-24 1:47 UTC (permalink / raw)
To: Paul Moore; +Cc: eparis, selinux
On Wed, 18 Sep 2013, Paul Moore wrote:
> Signed-off-by: Paul Moore <paul@paul-moore.com>
> ---
> MAINTAINERS | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e61c2e8..4fde706 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -7390,9 +7390,10 @@ SELINUX SECURITY MODULE
> M: Stephen Smalley <sds@tycho.nsa.gov>
> M: James Morris <james.l.morris@oracle.com>
> M: Eric Paris <eparis@parisplace.org>
> +M: Paul Moore <paul@paul-moore.com>
> L: selinux@tycho.nsa.gov (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
--
James Morris
<jmorris@namei.org>
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-09-24 1:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-18 17:14 [PATCH] selinux: add Paul Moore as a SELinux maintainer Paul Moore
2013-09-18 17:22 ` Eric Paris
2013-09-18 18:05 ` Paul Moore
2013-09-18 18:09 ` Eric Paris
2013-09-18 18:12 ` Paul Moore
2013-09-24 1:47 ` James Morris
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.