From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Feb 2017 19:26:09 +0000 (-0800)
Subject: Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.14-rc1~1434
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f14cc3b13d8f3ceee862f8365d37ba214630126a;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull VFIO updates from Alex Williamson:

 - Kconfig fixes for SPAPR_TCE_IOMMU=n (Michael Ellerman)

 - Module softdep rather than request_module to simplify usage from
   initrd (Alex Williamson)

 - Comment typo fix (Changbin Du)

* tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio:
  vfio: fix a typo in comment of function vfio_pin_pages
  vfio: Replace module request with softdep
  vfio/mdev: Use a module softdep for vfio_mdev
  vfio: Fix build break when SPAPR_TCE_IOMMU=n
---

f14cc3b13d8f3ceee862f8365d37ba214630126a