From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Feb 2015 19:55:21 +0000 (-0800)
Subject: Merge tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c189cb8ef62832f33b6cf757350a0270532a1ad8;p=openwrt%2Fstaging%2Fblogic.git

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

Pull VFIO updates from Alex Williamson:

 - IOMMU updates based on trace analysis
 - VFIO device request interface

* tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Add device request interface
  vfio-pci: Generalize setup of simple eventfds
  vfio: Add and use device request op for vfio bus drivers
  vfio: Tie IOMMU group reference to vfio group
  vfio: Add device tracking during unbind
  vfio/type1: Add conditional rescheduling
  vfio/type1: Chunk contiguous reserved/invalid page mappings
  vfio/type1: DMA unmap chunking
---

c189cb8ef62832f33b6cf757350a0270532a1ad8