From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exyHG-00058c-13 for qemu-devel@nongnu.org; Mon, 19 Mar 2018 13:08:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exyHC-00015T-Rn for qemu-devel@nongnu.org; Mon, 19 Mar 2018 13:08:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21868) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exyHC-00012c-Ko for qemu-devel@nongnu.org; Mon, 19 Mar 2018 13:08:50 -0400 Date: Mon, 19 Mar 2018 14:08:39 -0300 From: Eduardo Habkost Message-ID: <20180319170839.GQ3417@localhost.localdomain> References: <20180315181420.8694-1-ehabkost@redhat.com> <20180316192854.GM3417@localhost.localdomain> <20180319160110.19c4ed52@igors-macbook-pro.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180319160110.19c4ed52@igors-macbook-pro.local> Subject: Re: [Qemu-devel] [PULL v2 0/7] Machine queue, 2018-03-15 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: Peter Maydell , QEMU Developers , Marcel Apfelbaum On Mon, Mar 19, 2018 at 04:01:10PM +0100, Igor Mammedov wrote: > On Fri, 16 Mar 2018 16:28:54 -0300 > Eduardo Habkost wrote: > > > On Fri, Mar 16, 2018 at 07:05:29PM +0000, Peter Maydell wrote: > > > On 15 March 2018 at 18:14, Eduardo Habkost wrote: > > > > Changes in v2 (v1 was 2018-03-12): > > > > * Fix bsd-user build error > > > > > > > > The following changes since commit 56e8698ffa8aba9f762f980bc21b5340b006f24b: > > > > > > > > Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-speedup-130318-1' into staging (2018-03-15 14:48:09 +0000) > > > > > > > > are available in the Git repository at: > > > > > > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request > > > > > > > > for you to fetch changes up to 7cbb6fd8926b9b590c0725b9b7d0a11db6aefd08: > > > > > > > > cpu: drop unnecessary NULL check and cpu_common_class_by_name() (2018-03-15 14:52:40 -0300) > > > > > > > > ---------------------------------------------------------------- > > > > Machine queue, 2018-03-15 > > > > > > > > > > Hi. This produces several warning messages running make check: > > > > > > WARNING: cpu name for target 'riscv32' isn't defined, add it to cpus_map > > > WARNING: cpu name for target 'riscv64' isn't defined, add it to cpus_map > > > > Ouch, another conflict with the commits that added target/riscv > > after the original series was submitted. :( > > > > I will drop all the patches in this pull request except for the > > only bug fix there ("pc: correct misspelled CPU model-id for pc > > 2.2"). > > > > Igor, can you resubmit the cpu_model/cpu_type series fixing the > > warnings so I can queue it for v2.13? > Fixup should be trivial, I'll post it here as reply to offending patch. > > This kind of tree wide changes tend to break often if not merged > quickly and leaving old infrastructure around till 2.13 doesn't > look like good idea as someone will copy it and queued for 2.13 > tree well be broken again. > So I'd prefer if you'd send fixed up pull request instead of > dropping patches. I agree with you, but we're past soft freeze and this was the 3rd failing pull request due to the same series. But as we still have 1 day before hard freeze. I will merge your fixup and send a new pull request today -- Eduardo