[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11 |
Date: |
Mon, 23 Jan 2017 15:02:06 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
On 23/01/2017 11:07, Peter Maydell wrote:
> On 20 January 2017 at 13:31, Paolo Bonzini <address@hidden> wrote:
>> The following changes since commit 2ccede18bd24fce5db83fef3674563a1f256717b:
>>
>> Merge remote-tracking branch
>> 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2017-01-16
>> 12:41:35 +0000)
>>
>> are available in the git repository at:
>>
>> git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to abc62c89f3191774dbd600a2caec803cbf557160:
>>
>> pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8
>> (2017-01-20 13:22:57 +0100)
>
> Merge conflict here in the bit with the x-mach-use-reliable-get-clock
> entry in the PC_COMPAT stuff, so you should check that it got
> resolved correctly this time around.
Yes, the resolution matches what I sent as v4.
Paolo
> Applied to master, thanks.
>
> thanks
> -- PMM
>
- [Qemu-devel] [PULL 29/35] kvm: move cpu synchronization code, (continued)
- [Qemu-devel] [PULL 29/35] kvm: move cpu synchronization code, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 32/35] hax: add Darwin support, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 31/35] Plumb the HAXM-based hardware acceleration support, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 33/35] Revert "win32: don't run subprocess tests on Mingw32 platform", Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 35/35] pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 34/35] bitmap: assert that start and nr are non negative, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 30/35] target/i386: Add Intel HAX files, Paolo Bonzini, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, no-reply, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/20
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, Peter Maydell, 2017/01/23
- Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11,
Paolo Bonzini <=