From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Feb 2018 21:18:25 +0000 (-0800)
Subject: Merge tag 'vfio-v4.16-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.19~1681
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34b1cf60abb06fa79d5f8e56f1def843dbf91888;p=platform%2Fkernel%2Flinux-rpi.git

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
---

34b1cf60abb06fa79d5f8e56f1def843dbf91888