On 20 December 2017 at 13:19, Kevin Wolf <kw...@redhat.com> wrote: > The following changes since commit af352675efb7e92a1f5f6461a042a12015ab3d12: > > Merge remote-tracking branch 'remotes/aurel/tags/pull-target-sh4-20171218' > into staging (2017-12-19 19:11:11 +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 b4d526c87b26aff6d8b353951aa175a1236ad887: > > nvme: Add tracing (2017-12-20 11:05:49 +0100) > > ---------------------------------------------------------------- > Block layer patches
Hi; this has a merge conflict in hw/block/nvme.c where both sets of changes are changing the way that the function handles errors, and I'm not sure which is correct. Can you resolve and resend, please? thanks -- PMM
