From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Dec 2012 05:30:12 +0000 (-0800)
Subject: Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.12-rc1~1677
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54e37b8dbe9a398f74cef313404bd2f1deca7853;p=kernel%2Fkernel-generic.git

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

Pull vfio update from Alex Williamson.

* tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Enable device before attempting reset
  VFIO: fix out of order labels for error recovery in vfio_pci_init()
  VFIO: use ACCESS_ONCE() to guard access to dev->driver
  VFIO: unregister IOMMU notifier on error recovery path
  vfio-pci: Re-order device reset
  vfio: simplify kmalloc+copy_from_user to memdup_user
---

54e37b8dbe9a398f74cef313404bd2f1deca7853