From: Linus Torvalds Date: Tue, 5 Mar 2019 02:56:36 +0000 (-0800) Subject: Merge tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a83b04232cec52a8a93700ab7f17a09500c558b8;p=linux.git Merge tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio Pull VFIO updates from Alex Williamson: - Switch mdev to generic UUID API (Andy Shevchenko) - Fixup platform reset include paths (Masahiro Yamada) - Fix usage of MINORMASK (Chengguang Xu) - Remove noise from duplicate spapr table unsets (Alexey Kardashevskiy) - Restore device state after PM reset (Alex Williamson) - Ensure memory translation enabled for PCI ROM access (Eric Auger) * tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio: vfio_pci: Enable memory accesses before calling pci_map_rom vfio/pci: Restore device state on PM transition vfio/spapr_tce: Skip unsetting already unset table samples/vfio-mdev/mtty: expand minor range when registering chrdev region samples/vfio-mdev/mdpy: expand minor range when registering chrdev region samples/vfio-mdev/mbochs: expand minor range when registering chrdev region vfio: expand minor range when registering chrdev region vfio: platform: reset: fix up include directives to remove ccflags-y vfio-mdev: Switch to use new generic UUID API --- a83b04232cec52a8a93700ab7f17a09500c558b8