From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuyfC-0006OH-Ll for qemu-devel@nongnu.org; Wed, 20 May 2015 03:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yuyf8-0004ja-IC for qemu-devel@nongnu.org; Wed, 20 May 2015 03:43:38 -0400 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:37914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yuyf8-0004jM-Bb for qemu-devel@nongnu.org; Wed, 20 May 2015 03:43:34 -0400 Received: by wichy4 with SMTP id hy4so49693669wic.1 for ; Wed, 20 May 2015 00:43:33 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <555C3B22.4070205@redhat.com> Date: Wed, 20 May 2015 09:43:30 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1429085097-12064-1-git-send-email-lihbbj@linux.vnet.ibm.com> <1429085097-12064-2-git-send-email-lihbbj@linux.vnet.ibm.com> In-Reply-To: <1429085097-12064-2-git-send-email-lihbbj@linux.vnet.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 1/1] S390 pci infrastructure modeling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hong Bo Li , qemu-devel@nongnu.org, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, agraf@suse.de, mst@redhat.com On 15/04/2015 10:04, Hong Bo Li wrote: > @@ -513,29 +541,12 @@ static int s390_pcihost_setup_msix(S390PCIBusDevice *pbdev) > return 0; > } > > +/* this function is useless, just keep it to make the patch more > + readable. Without this function, the diff will mix these hotplug > + functions together. will be removed in future */ Try adding this to your .gitconfig: [diff] algorithm = patience Paolo