From: Paul Moore <pmoore@redhat.com>
To: Eric Paris <eparis@parisplace.org>
Cc: selinux@tycho.nsa.gov
Subject: Re: [PATCH] selinux: add Paul Moore as a SELinux maintainer
Date: Wed, 18 Sep 2013 14:05:17 -0400 [thread overview]
Message-ID: <13288872.e4rikYWUTT@sifl> (raw)
In-Reply-To: <1379524979.3032.53.camel@localhost>
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.
next prev parent reply other threads:[~2013-09-18 18:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2013-09-18 18:09 ` Eric Paris
2013-09-18 18:12 ` Paul Moore
2013-09-24 1:47 ` James Morris
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=13288872.e4rikYWUTT@sifl \
--to=pmoore@redhat.com \
--cc=eparis@parisplace.org \
--cc=selinux@tycho.nsa.gov \
/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 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.