From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Oct 2018 18:01:38 +0000 (-0700)
Subject: Merge tag 'vfio-v4.20-rc1.v2' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0c86e761b95131943c2b8af2ffb3c0554f9a71f5;p=linux.git

Merge tag 'vfio-v4.20-rc1.v2' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - EDID interfaces for vfio devices supporting display extensions (Gerd
   Hoffmann)

 - Generically select Type-1 IOMMU model support on ARM/ARM64 (Geert
   Uytterhoeven)

 - Quirk for VFs reporting INTx pin (Alex Williamson)

 - Fix error path memory leak in MSI support (Li Qiang)

* tag 'vfio-v4.20-rc1.v2' of git://github.com/awilliam/linux-vfio:
  vfio: add edid support to mbochs sample driver
  vfio: add edid api for display (vgpu) devices.
  drivers/vfio: Allow type-1 IOMMU instantiation with all ARM/ARM64 IOMMUs
  vfio/pci: Mask buggy SR-IOV VF INTx support
  vfio/pci: Fix potential memory leak in vfio_msi_cap_len
---

0c86e761b95131943c2b8af2ffb3c0554f9a71f5