From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bup4v-00036G-TQ for qemu-devel@nongnu.org; Thu, 13 Oct 2016 19:06:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bup4t-0001kr-Nv for qemu-devel@nongnu.org; Thu, 13 Oct 2016 19:06:20 -0400 Date: Fri, 14 Oct 2016 09:28:35 +1100 From: David Gibson Message-ID: <20161013222835.GP18039@umbus.fritz.box> References: <1476335734-29831-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zn4k3Q+N5puqXur4" Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL 0/4] ppc patches for qemu-2.7 stable branch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-stable , Thomas Huth , QEMU Developers , Alexander Graf , "qemu-ppc@nongnu.org" , Anton Blanchard --zn4k3Q+N5puqXur4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 13, 2016 at 12:57:19PM +0100, Peter Maydell wrote: > On 13 October 2016 at 12:54, Peter Maydell wro= te: > > On 13 October 2016 at 06:15, David Gibson = wrote: > >> The following changes since commit 1dc33ed90bf1fe1c2014dffa0d9e863c520= d953a: > >> > >> 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 2e68f28854f0120c9a938a61b64aaf1eaecb162= b: > >> > >> ppc: Check the availability of transactional memory (2016-10-13 12:5= 8:06 +1100) > > > > Applied to master, thanks. (I hope that was what you had in mind; > > if not we'll have to unwind stuff somehow...) >=20 > unwind> looking more closely, there's no actual diff between HEAD > now and what it was, so the merge commit is a no-op of sorts. > Hopefully it doesn't cause any problems. Right.. these were all (clean) cherry picks from the master branch anyway, so I'd expect it to be a no-op. > 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? --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --zn4k3Q+N5puqXur4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYAAqTAAoJEGw4ysog2bOS4FEP/iwWQWmHHCxzJZuzM8KVI9gJ k58lQmQ2Q/+Jyi8xkCIPpNsyxRxHRQzTqIkKPpM8OBIeyYNTx2S0wnVMJJb92+bJ Ts85lNdsUfKjX2xsg42DV1mMeOU19FIKhULZ1IPZRo8S3HLGOVxuXjFnMAMIkcLI MCjPHCad7Ne+ZIr/Nqkz4DgBDFuPOJWWUPO4mUT0r7u6hv4fUq/inRH210wxEOev f3WfD1ZQJK1nzWZJ0UPwC2UPLSEi+6AEnjnFXQV0ehefo5kei/MGYZ67W+PUFaH2 IWRRoDOslqkB8o99fUULBWu93/SCdltsGHfO+/hfyX8uPTfRXRLtuZGEDEK5dpJZ EItb4zoGN6GjNm+C4hVqbhvpfcfJW7AqIui9L4NvU/JN2LebgU5S5YMr3WX8K/XC 2ahoBpqau0c34nLSsgJTYdpGwj/n86+pZAZZjIBnEICcoAFM4UIqmpvDEdjTYiPU Iu66akswvdEB4n7iWjMWcYd4eSR09MThN7RpTmpxbh/opUsrJc3+h74Kf1V5W7R8 NdJ/sWnXvTQVrquPDFiKCxILyLYD9051Swp1ma11AxNVu0oiYxxUZdkOKJQN03HQ a1y0Zrcku6tEwXs0OUyDnztl+6mMtj386Vz9REiU9jpRdvNkSfEmFIFMU9Qsb4Xk YQiJ+TRI24aFNXdK1FkH =0Llr -----END PGP SIGNATURE----- --zn4k3Q+N5puqXur4--