On 14 October 2016 at 09:27, Greg Kurz <gr...@kaod.org> wrote:
> On Fri, 14 Oct 2016 09:28:35 +1100
> David Gibson <da...@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.mayd...@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
> Then Michael does all the cherry picking stuff and usually sends a
> patch round-up two weeks before the stable release, for people to
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.