From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:39637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr1oO-0001yB-1r for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:34:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr1oM-0006zi-Se for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:34:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32898) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr1oM-0006a7-Gd for qemu-devel@nongnu.org; Tue, 05 Feb 2019 09:34:54 -0500 References: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> <014991ae-f48e-4a82-b1d1-2ae3034606cc@redhat.com> From: Paolo Bonzini Message-ID: Date: Tue, 5 Feb 2019 15:34:18 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 00/77] Misc patches for 2019-02-04 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers On 05/02/19 13:45, Peter Maydell wrote: > On Tue, 5 Feb 2019 at 11:27, Paolo Bonzini wrote: >> >> On 05/02/19 10:35, Peter Maydell wrote: >>> On Mon, 4 Feb 2019 at 18:38, Paolo Bonzini wrote: >>>> >>>> The following changes since commit 773c4a6228fd910556cee2d477ee56c591a30000: >>>> >>>> test-filter-mirror: pass UNIX domain socket through fd (2019-02-04 16:03:20 +0000) >>>> >>>> are available in the git repository at: >>>> >>>> git://github.com/bonzini/qemu.git tags/for-upstream >>> >>> Hi; my script says: >>> error: remotes/bonzini/tags/for-upstream: cannot verify a non-tag >>> object of type commit. >>> Does not appear to be a signed tag >>> >>> Did something go wrong at your end? >> >> Hmm this is a first. Repushed now. > > I get this conflict in default-configs/lm32-softmmu.mak that I don't > know how to resolve: I'll resend. Paolo