On 29 January 2016 at 17:37, Kevin Wolf <kw...@redhat.com> wrote: > The following changes since commit 047e363b05679724d6b784c6ec6310697fe48ba0: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging (2016-01-22 > 15:19:21 +0000) > > are available in the git repository at: > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to ae873754e7b51f66f2b944f49b7baff2730ec511: > > Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-01-29' > into queue-block (2016-01-29 18:11:39 +0100) > > ---------------------------------------------------------------- > > Block layer patches
Hi. I'm afraid this has some conflicts in hw/block/fdc.c which aren't immediately obvious how to resolve. (Looks like clash between the 'add pick_drive' patch in John's recent IDE pull and Max's tray status stuff here.) Can you fix up and resend, please? thanks -- PMM
