From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Aug 2017 22:25:14 +0000 (-0700)
Subject: Merge tag 'vfio-v4.13-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.14-rc1~347
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=869c058fbe741cadff09647c68dbeae7d012f52d;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'vfio-v4.13-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - SPAPR/EEH config build fix (Murilo Opsfelder Araujo)

 - Fix possible device lock deadlock (Alex Williamson)

 - Correctly size integrated endpoint PCIe capabilities (Alex
   Williamson)

* tag 'vfio-v4.13-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Fix handling of RC integrated endpoint PCIe capability size
  vfio/pci: Use pci_try_reset_function() on initial open
  include/linux/vfio.h: Guard powerpc-specific functions with CONFIG_VFIO_SPAPR_EEH
---

869c058fbe741cadff09647c68dbeae7d012f52d