From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:50918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtYgO-00018t-4e for qemu-devel@nongnu.org; Tue, 12 Feb 2019 09:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtYgM-0005H5-9N for qemu-devel@nongnu.org; Tue, 12 Feb 2019 09:05:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45151) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtYgM-0005Fe-2w for qemu-devel@nongnu.org; Tue, 12 Feb 2019 09:05:06 -0500 Date: Tue, 12 Feb 2019 09:04:36 -0500 From: "Michael S. Tsirkin" Message-ID: <20190212090418-mutt-send-email-mst@kernel.org> References: <20190204205105-mutt-send-email-mst@kernel.org> <20190205110518-mutt-send-email-mst@kernel.org> <20190212071114.GM1011@xz-x1> <20190212080349-mutt-send-email-mst@kernel.org> <5716364b-da70-e134-4ed0-d3d136d9ba8a@redhat.com> <20190212082336-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 00/25] pci, pc, virtio: fixes, cleanups, features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: Peter Xu , Peter Maydell , QEMU Developers , Changpeng Liu , Stefan Hajnoczi , Stefano Garzarella On Tue, Feb 12, 2019 at 02:53:16PM +0100, Philippe Mathieu-Daud=E9 wrote: > On 2/12/19 2:24 PM, Michael S. Tsirkin wrote: > > On Tue, Feb 12, 2019 at 02:15:36PM +0100, Philippe Mathieu-Daud=E9 wr= ote: > >> On 2/12/19 2:04 PM, Michael S. Tsirkin wrote: > >>> On Tue, Feb 12, 2019 at 11:39:21AM +0100, Philippe Mathieu-Daud=E9 = wrote: > >>>> On 2/12/19 8:11 AM, Peter Xu wrote: > >>>>> On Tue, Feb 05, 2019 at 11:06:42AM -0500, Michael S. Tsirkin wrot= e: > >>>>>> > >>>>>> OK I reverted the whole part dealing with vhost-user and reposte= d. > >>>>> > >>>>> I noticed that the merged pull request could possibly have squash= ed > >>>>> the below two patches (in previous pull) into one super patch > >>>>> (a56de056c91f87e1e): > >>>>> > >>>>> i386/kvm: ignore masked irqs when update msi routes > >>>>> contrib/vhost-user-blk: fix the compilation issue > >>>>> > >>>>> Here, the first patch lost its commit message, and the last patch= lost > >>>>> its real author. ;) > >>>> > >>>> I suggest we revert a56de056c9 ASAP and reapply the both patches, = this > >>>> will ease cherry-picking/downstream workflow. > >>> > >>> I don't see why does it help upstream. > >> > >> I'd have suggested the same if I had no idea what 'downstream workfl= ow' > >> mean, simply to keep the tree clear and avoid to have unrelated chan= ges > >> squashed altogether. > >> Commit a56de056c9 really looks messy. MSI/MSIX changes described by = "fix > >> vhost-user-blk compilation". > >> Hopefully it won't trigger any problem which requires bisecting to i= t, > >> then contact Changpeng Liu asking him what he intented to do with hi= s > >> commit. > >> Your call anyway :) > >> > >> Regards, > >> > >> Phil. > >=20 > >=20 > > OK these are good points. I'm not sure what happened but it looks lik= e I > > screwed up when resolving some conflicts. Care posting a patchset > > looking sane? >=20 > Yes, will do. Thanks! Include the reverts in it pls. --=20 MST