From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Jun 2016 19:25:36 +0000 (-0700)
Subject: Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v5.15~13455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:
 "Fix irqfd shutdown ordering, build warning, and VPD short read"

* tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Allow VPD short read
  vfio/type1: Fix build warning
  vfio/pci: Fix ordering of eventfd vs virqfd shutdown
---

f2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4