All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Hong Bo Li <lihbbj@linux.vnet.ibm.com>,
	qemu-devel@nongnu.org, cornelia.huck@de.ibm.com,
	borntraeger@de.ibm.com, agraf@suse.de, mst@redhat.com
Subject: Re: [Qemu-devel] [PATCH v1 1/1] S390 pci infrastructure modeling
Date: Wed, 20 May 2015 09:43:30 +0200	[thread overview]
Message-ID: <555C3B22.4070205@redhat.com> (raw)
In-Reply-To: <1429085097-12064-2-git-send-email-lihbbj@linux.vnet.ibm.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

  parent reply	other threads:[~2015-05-20  7:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-15  8:04 [Qemu-devel] [PATCH v1 0/1] s390 pci infrastucture modeling Hong Bo Li
2015-04-15  8:04 ` [Qemu-devel] [PATCH v1 1/1] S390 pci infrastructure modeling Hong Bo Li
2015-04-21  5:29   ` Hong Bo Li
2015-05-12  9:07     ` Cornelia Huck
2015-05-20  6:54       ` Hong Bo Li
2015-05-20  7:47       ` Paolo Bonzini
2015-05-21 11:11         ` Hong Bo Li
2015-05-20  7:43   ` Paolo Bonzini [this message]
2015-04-15  8:19 ` Hong Bo Li
  -- strict thread matches above, loose matches on Subject: below --
2015-04-15  6:48 [Qemu-devel] [PATCH v1 0/1] s390 pci infrastucture modeling Hong Bo Li
2015-04-15  6:48 ` [Qemu-devel] [PATCH v1 1/1] s390 pci infrastructure modeling Hong Bo Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=555C3B22.4070205@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=lihbbj@linux.vnet.ibm.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.