From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Oct 2012 23:50:56 +0000 (+0900)
Subject: Merge tag 'vfio-for-v3.7-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: firefly_0821_release~3680^2~1860
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3dddebe059d81a39aa1135b6e6d18ebfa4d25384;p=firefly-linux-kernel-4.4.55.git

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

Pull vfio fixes from Alex Williamson:
 "This includes a fix for PCI BAR mmaps after recent mm changes, fixing
  an interrupt race, and fixing a consistency bug in interrupt state
  when switching interrupt modes."

* tag 'vfio-for-v3.7-rc1' of git://github.com/awilliam/linux-vfio:
  vfio: Fix PCI INTx disable consistency
  vfio: Move PCI INTx eventfd setting earlier
  vfio: Fix PCI mmap after b3b9c293
---

3dddebe059d81a39aa1135b6e6d18ebfa4d25384