Re: [PULL v2 00/62] Misc patches for 2019-12-16

[Paolo Bonzini]

On 17/12/19 19:21, Peter Maydell wrote:
> On Tue, 17 Dec 2019 at 18:21, Paolo Bonzini <address@hidden> wrote:
>>
>> On 17/12/19 19:13, Peter Maydell wrote:
>>> On Tue, 17 Dec 2019 at 17:59, Paolo Bonzini <address@hidden> wrote:
>>>>
>>>> The following changes since commit 
>>>> 084a398bf8aa7634738e6c6c0103236ee1b3b72f:
>>>>
>>>>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' 
>>>> into staging (2019-12-13 18:14:07 +0000)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>
>>>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>>>
>>>> for you to fetch changes up to 74c14076700436f9d340652042c81f46eaf0cf9f:
>>>>
>>>>   colo: fix return without releasing RCU (2019-12-17 14:03:44 +0100)
>>>>
>>>> ----------------------------------------------------------------
>>>> * More uses of RCU_READ_LOCK_GUARD (Dave, myself)
>>>> * QOM doc improvments (Greg)
>>>> * Cleanups from the Meson conversion (Marc-André)
>>>> * Support for multiple -accel options (myself)
>>>> * Many x86 machine cleanup (Philippe, myself)
>>>> * tests/migration-test cleanup (Juan)
> 
>>> I could probably figure out the resolution but I'm about 5 minutes
>>> from having to leave the office; sorry.
>>
>> I pushed a merge commit to the same place.
> 
> A what? I can't merge a merge commit. Just fix the series
> and resend, please.

You have done so in the past, I'll rebase and send v3 even though this
is invalidating the testing that was done on individual patches.

Paolo