From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>, Greg Kurz <groug@kaod.org>,
David Gibson <david@gibson.dropbear.id.au>,
"qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>,
qemu-stable <qemu-stable@nongnu.org>,
QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [Qemu-stable] [Qemu-ppc] [PULL 0/4] ppc patches for qemu-2.7 stable branch
Date: Mon, 17 Oct 2016 13:13:48 -0500 [thread overview]
Message-ID: <20161017181348.29726.67454@loki> (raw)
In-Reply-To: <CAFEAcA-nEeDbioJv94jhZT+oBm=mYXaJrasN6qCkdSMEUbcO1A@mail.gmail.com>
Quoting Peter Maydell (2016-10-17 12:33:18)
> On 17 October 2016 at 17:51, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> > Maybe just a tag like [PULL for-stable], or [PULL for-2.7]?
> >
> > The latter seems to mirror how we handle things for patches coming for
> > master during freeze. Others who've submitted patches they've
> > backported themselves for stable seem to naturally lean toward that
> > approach as well.
> >
> > That said, this might get confusing immediately after a release, where
> > there are a lot of patches floating around with such tags, cc:'d for
> > stable, that aren't actually meant to be directly pulled into stable.
> > So I think I would lean toward "for-stable", or, even better,
> > "for-2.7.1", etc.
> >
> > I don't do automated pulls so it's not a huge deal either way for me,
> > but "for-x" in general should hopefully be enough for Peter to filter
> > them out for master based on what whether "x" references the next
> > major release or not.
>
> I don't really want to have to update my email filters every
> time we do a release, though, and so "for-X.Y" doesn't work because
> when we are in the runup to release pull requests targeting
> master tend to be marked that way.
What about just for-stable, for-stable-2.7, for-ppc-2.8, etc.?
Basically just adopt the for-* prefix for these sorts of pulls,
but reserve the for-x.y prefix for master, so that anything
that doesn't match for-\d\.\d can get filtered out based on
that single rule?
>
> Maybe just having not-for-master pull requests say "not for master"
> in the cover letter somewhere ?
I tend to treat PULLs cc'd for stable as just having individual patches
marked for stable, so it's a bit easier to miss if it's not something
obvious like a subject line tag.
It also kind of leaves it as an exercise for the reader what branch
other than master is actually the intended target for stuff like
sub-maintainer pulls (where there might actually be a bit more
automation).
We could do both though: use some ad-hoc way to tag for a particular
sub-maintainer tree/stable branch, as well as an explicit "not for
master" in the cover letter ensure it doesn't go into master. It's a bit
more redundant, but flexible in that people can use whatever tagging
format they want for a particular tree.
>
> thanks
> -- PMM
>
next prev parent reply other threads:[~2016-10-17 18:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 5:15 [Qemu-devel] [PULL 0/4] ppc patches for qemu-2.7 stable branch David Gibson
2016-10-13 5:15 ` [Qemu-devel] [PULL 1/4] linux-headers: update David Gibson
2016-10-13 5:15 ` [Qemu-devel] [PULL 2/4] hw/ppc/spapr: Move code related to "ibm, pa-features" to a separate function David Gibson
2016-10-13 5:15 ` [Qemu-devel] [PULL 3/4] hw/ppc/spapr: Fix the selection of the processor features David Gibson
2016-10-13 5:15 ` [Qemu-devel] [PULL 4/4] ppc: Check the availability of transactional memory David Gibson
2016-10-13 11:54 ` [Qemu-devel] [PULL 0/4] ppc patches for qemu-2.7 stable branch Peter Maydell
2016-10-13 11:57 ` Peter Maydell
2016-10-13 22:28 ` David Gibson
2016-10-14 8:27 ` [Qemu-devel] [Qemu-ppc] " Greg Kurz
2016-10-14 17:38 ` Peter Maydell
2016-10-17 7:44 ` Thomas Huth
2016-10-17 16:51 ` [Qemu-devel] [Qemu-stable] " Michael Roth
2016-10-17 17:33 ` Peter Maydell
2016-10-17 18:13 ` Michael Roth [this message]
2016-10-17 18:45 ` Peter Maydell
2016-10-17 21:24 ` Michael Roth
2016-10-17 21:49 ` Peter Maydell
2016-10-25 1:41 ` David Gibson
2016-10-25 23:57 ` Michael Roth
2016-11-01 2:26 ` David Gibson
2016-11-02 23:49 ` Michael Roth
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=20161017181348.29726.67454@loki \
--to=mdroth@linux.vnet.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=thuth@redhat.com \
/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).