Re: [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11

[Peter Maydell]

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.

Applied to master, thanks.

thanks
-- PMM