Re: [Qemu-devel] [PULL 00/54] Misc patches for 2018-12-12

[Thomas Huth]

On 2018-12-12 17:16, Eric Blake wrote:
> On 12/12/18 9:22 AM, Paolo Bonzini wrote:
>> The following changes since commit
>> bb9bf94b3e8926553290bc9a7cb84315af422086:
>>
>>    Merge remote-tracking branch
>> 'remotes/ehabkost/tags/machine-next-pull-request' into staging
>> (2018-12-11 19:18:58 +0000)
>>
>> are available in the git repository at:
>>
>>
>>    git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to e2a9129b491fdb3be3661baf08a9fa4c2e19a028:
>>
>>    vhost-user-test: create a temporary directory per TestServer
>> (2018-12-12 13:49:31 +0100)
>>
>> This introduces a new dependency on perl's Test::Harness package. 
>> This is
>> distributed in package perl-Test-Harness for Fedora, and
>> libtest-harness-perl
>> for Debian.  I couldn't find anything for BSD or macOS, but at least the
>> Patchew BSD images already have it so it is probably bundled with Perl.
> 
>> * add explicit checks for the compiler version and cleanup (Thomas)
> 
> Thomas sent a separate pull request for these. Git will probably do the
> right thing if the two pull requests have identical commits, but I
> didn't check if there were any minor variations in patch contents that
> would cause a conflict.

There's likely a conflict in the "-fno-gcse" patch since this has minor
edits ... Sorry for that.

So Peter, you've got two options now:

1) Apply Paolo's series. I'll then send a revert for patch 24/54 later.

2) Apply my series first. In that case, I think Paolo should send a v2
of his PULL request with patch 24 and 33-39 dropped.

 Thomas