From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55317)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bv6RS-0005Kg-8Y
	for qemu-devel@nongnu.org; Fri, 14 Oct 2016 13:38:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1bv6RR-000170-7i
	for qemu-devel@nongnu.org; Fri, 14 Oct 2016 13:38:46 -0400
Received: from mail-vk0-x232.google.com ([2607:f8b0:400c:c05::232]:32827)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
	id 1bv6RR-00016l-3D
	for qemu-devel@nongnu.org; Fri, 14 Oct 2016 13:38:45 -0400
Received: by mail-vk0-x232.google.com with SMTP id 83so99057186vkd.0
	for <qemu-devel@nongnu.org>; Fri, 14 Oct 2016 10:38:44 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20161014102759.566a1c5e@bahia>
References: <1476335734-29831-1-git-send-email-david@gibson.dropbear.id.au>
	<CAFEAcA8C8xc2LTgVvZz1pO00MLDjEY=rSYi7yr4HkE6Uj+eA7w@mail.gmail.com>
	<CAFEAcA9ZXTgU4mXrYhBrjnBNJgzhbT3zzL-11U4hm7RZzCSWfw@mail.gmail.com>
	<20161013222835.GP18039@umbus.fritz.box>
	<20161014102759.566a1c5e@bahia>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 14 Oct 2016 18:38:24 +0100
Message-ID: <CAFEAcA8PBVe9ROfawpf5STmtyecfMA=9SAporbQ9s99m+ZG5KA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [Qemu-ppc] [PULL 0/4] ppc patches for qemu-2.7
 stable branch
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Greg Kurz <groug@kaod.org>
Cc: David Gibson <david@gibson.dropbear.id.au>, Thomas Huth <thuth@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>, qemu-stable <qemu-stable@nongnu.org>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>

On 14 October 2016 at 09:27, Greg Kurz <groug@kaod.org> wrote:
> On Fri, 14 Oct 2016 09:28:35 +1100
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
>> On Thu, Oct 13, 2016 at 12:57:19PM +0100, Peter Maydell wrote:
>> > On 13 October 2016 at 12:54, Peter Maydell <peter.maydell@linaro.org> wrote:
>> > More generally, we need to come up with something for distinguishing
>> > PULL requests not for master, because my current workflow basically
>> > says "anything that says 'for you to fetch changes up to' will get
>> > merged into master...
>>
>> Um.. yes.. this was intended for merge to the 2.7 branch, not master.
>> Any ideas how I should express that?
>>
>
> I'm not aware of any formal process, other than sending a mail to
> qemu-stable and Cc: Michael Roth. This is often done by simply
> replying to selected messages in the pull requests for the master
> branch.
>
> Then Michael does all the cherry picking stuff and usually sends a
> patch round-up two weeks before the stable release, for people to
> review.

Yes, I think I was partly thrown because in general patches
don't go into the stable branches via pull requests.
That said, my current filter/workflow is clearly broken
so I'm open to any suggestions for easy-for-me-to-filter-for
ways to flag up that a pull request isn't aimed at master.

thanks
-- PMM