From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buxqg-0006Eq-3T for qemu-devel@nongnu.org; Fri, 14 Oct 2016 04:28:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buxqb-0003Im-Ph for qemu-devel@nongnu.org; Fri, 14 Oct 2016 04:28:12 -0400 Received: from 7.mo179.mail-out.ovh.net ([46.105.61.94]:58375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buxqb-0003Hf-Eu for qemu-devel@nongnu.org; Fri, 14 Oct 2016 04:28:09 -0400 Received: from player792.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id A1198FFB014 for ; Fri, 14 Oct 2016 10:28:07 +0200 (CEST) Date: Fri, 14 Oct 2016 10:27:59 +0200 From: Greg Kurz Message-ID: <20161014102759.566a1c5e@bahia> In-Reply-To: <20161013222835.GP18039@umbus.fritz.box> References: <1476335734-29831-1-git-send-email-david@gibson.dropbear.id.au> <20161013222835.GP18039@umbus.fritz.box> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/bM+ngXjTcxJ=VfIjUdDUn15"; protocol="application/pgp-signature" Subject: Re: [Qemu-devel] [Qemu-ppc] [PULL 0/4] ppc patches for qemu-2.7 stable branch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Peter Maydell , Thomas Huth , QEMU Developers , qemu-stable , "qemu-ppc@nongnu.org" --Sig_/bM+ngXjTcxJ=VfIjUdDUn15 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 14 Oct 2016 09:28:35 +1100 David Gibson wrote: > On Thu, Oct 13, 2016 at 12:57:19PM +0100, Peter Maydell wrote: > > On 13 October 2016 at 12:54, Peter Maydell w= rote: =20 > > > On 13 October 2016 at 06:15, David Gibson wrote: =20 > > >> The following changes since commit 1dc33ed90bf1fe1c2014dffa0d9e863c5= 20d953a: > > >> > > >> Update version for v2.7.0 release (2016-09-02 13:44:11 +0100) > > >> > > >> are available in the git repository at: > > >> > > >> git://github.com/dgibson/qemu.git tags/ppc-for-2.7-20161013 > > >> > > >> for you to fetch changes up to 2e68f28854f0120c9a938a61b64aaf1eaecb1= 62b: > > >> > > >> ppc: Check the availability of transactional memory (2016-10-13 12= :58:06 +1100) =20 > > > > > > Applied to master, thanks. (I hope that was what you had in mind; > > > if not we'll have to unwind stuff somehow...) =20 > > =20 > > unwind> looking more closely, there's no actual diff between HEAD =20 > > now and what it was, so the merge commit is a no-op of sorts. > > Hopefully it doesn't cause any problems. =20 >=20 > Right.. these were all (clean) cherry picks from the master branch > anyway, so I'd expect it to be a no-op. >=20 > > 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... =20 >=20 > Um.. yes.. this was intended for merge to the 2.7 branch, not master. > Any ideas how I should express that? >=20 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=20 patch round-up two weeks before the stable release, for people to review. Cheers. -- Greg --Sig_/bM+ngXjTcxJ=VfIjUdDUn15 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlgAlw8ACgkQAvw66wEB28IjvgCdE6Luy29L4/BL8e+ynGl4s6oa j4UAnid4wJegKdfj5eiIg5Bgm4S4w7Qd =qBzp -----END PGP SIGNATURE----- --Sig_/bM+ngXjTcxJ=VfIjUdDUn15--