Re: [Qemu-devel] [PATCH v1 1/1] S390 pci infrastructure modeling

[Paolo Bonzini]

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