The following changes since commit 7b93d78a04aa242d377ae213b79db6c319c71847:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-03-26 15:17:25 +0100) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to eb69953ecb1cbe7b4c4093a97a4dab3daa315d4e: macio: fix NULL pointer dereference when issuing IDE trim (2018-03-27 00:38:00 -0400) ---------------------------------------------------------------- ---------------------------------------------------------------- Anton Nefedov (1): ide: fix invalid TRIM range abortion for macio Mark Cave-Ayland (1): macio: fix NULL pointer dereference when issuing IDE trim hw/ide/core.c | 17 +++++++++-------- hw/ide/macio.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) -- 2.14.3