From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Jun 2015 19:32:13 +0000 (-0700)
Subject: Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v4.2-rc1~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b779157dd3db6199b50e7ad64678a1ceedbeebcf;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull VFIO updates from Alex Williamson:

 - fix race with device reference versus driver release (Alex Williamson)

 - add reset hooks and Calxeda xgmac reset for vfio-platform (Eric Auger)

 - enable vfio-platform for ARM64 (Eric Auger)

 - tag Baptiste Reynal as vfio-platform sub-maintainer (Alex Williamson)

* tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio:
  MAINTAINERS: Add vfio-platform sub-maintainer
  VFIO: platform: enable ARM64 build
  VFIO: platform: Calxeda xgmac reset module
  VFIO: platform: populate the reset function on probe
  VFIO: platform: add reset callback
  VFIO: platform: add reset struct and lookup table
  vfio/pci: Fix racy vfio_device_get_from_dev() call
---

b779157dd3db6199b50e7ad64678a1ceedbeebcf