From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alBwJ-0006xg-LC for qemu-devel@nongnu.org; Wed, 30 Mar 2016 04:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alBwI-0002yT-LR for qemu-devel@nongnu.org; Wed, 30 Mar 2016 04:57:23 -0400 Date: Wed, 30 Mar 2016 10:57:14 +0200 From: Kevin Wolf Message-ID: <20160330085714.GA4135@noname.redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL 00/48] Block layer patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers , Qemu-block Am 29.03.2016 um 21:56 hat Peter Maydell geschrieben: > On 29 March 2016 at 16:08, Kevin Wolf wrote: > > The following changes since commit b68a80139e37e806f004237e55311ebc42151434: > > > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000) > > > > are available in the git repository at: > > > > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > > > for you to fetch changes up to b63f2a6772ca774ec58b2fc6e26fdeeda44a99c1: > > > > iotests: Test qemu-img convert -S 0 behavior (2016-03-29 16:30:13 +0200) > > > > ---------------------------------------------------------------- > > Block layer patches > > Hi. I'm afraid this doesn't compile: > [...] > Looks like you've also been hit by commit da34e65cb4025, which > means you now need to explicitly include qapi/error.h if you need it. Ok, I can (and will, unless you tell me not to) send a v2 of the pull request; but generally speaking, wouldn't it make more sense and be easier for everyone involved (including yourself) if such merge conflicts where you know exactly what trivial fixup needs to be done were handled in the merge commit? Kevin