diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-04 18:56:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-04 18:56:36 -0800 |
| commit | a83b04232cec52a8a93700ab7f17a09500c558b8 (patch) | |
| tree | af908027b4c52728d30fe2ab0b7f18600d8c956d /include | |
| parent | fs: Make splice() and tee() take into account O_NONBLOCK flag on pipes (diff) | |
| parent | vfio_pci: Enable memory accesses before calling pci_map_rom (diff) | |
| download | linux-dev-a83b04232cec52a8a93700ab7f17a09500c558b8.tar.xz linux-dev-a83b04232cec52a8a93700ab7f17a09500c558b8.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mdev.h b/include/linux/mdev.h index b6e048e1045f..d7aee90e5da5 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h @@ -120,7 +120,7 @@ struct mdev_driver { extern void *mdev_get_drvdata(struct mdev_device *mdev); extern void mdev_set_drvdata(struct mdev_device *mdev, void *data); -extern uuid_le mdev_uuid(struct mdev_device *mdev); +extern const guid_t *mdev_uuid(struct mdev_device *mdev); extern struct bus_type mdev_bus_type; |