diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-02 00:18:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-02 00:18:25 +0300 |
| commit | 34b1cf60abb06fa79d5f8e56f1def843dbf91888 (patch) | |
| tree | 2b6145709fa3c5900957cc0f625fad85f9378c7b /fs/nls/nls_cp861.c | |
| parent | 27529c891b132f4fc65711334e885f466138ea2a (diff) | |
| parent | 46ed90f157f42d956ffed17c003f089a59b76e3e (diff) | |
| download | linux-34b1cf60abb06fa79d5f8e56f1def843dbf91888.tar.xz | |
Merge tag 'vfio-v4.16-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Mask INTx from user if pdev->irq is zero (Alexey Kardashevskiy)
- Capability helper cleanup (Alex Williamson)
- Allow mmaps overlapping MSI-X vector table with region capability
exposing this feature (Alexey Kardashevskiy)
- mdev static cleanups (Xiongwei Song)
* tag 'vfio-v4.16-rc1' of git://github.com/awilliam/linux-vfio:
vfio: mdev: make a couple of functions and structure vfio_mdev_driver static
vfio-pci: Allow mapping MSIX BAR
vfio: Simplify capability helper
vfio-pci: Mask INTx if a device is not capabable of enabling it
Diffstat (limited to 'fs/nls/nls_cp861.c')
0 files changed, 0 insertions, 0 deletions