diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 12:32:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-28 12:32:13 -0700 |
| commit | b779157dd3db6199b50e7ad64678a1ceedbeebcf (patch) | |
| tree | d00314f158869d072849f4635f70b80680a04638 /arch/um | |
| parent | 4a10a91756ef381bced7b88cfb9232f660b92d93 (diff) | |
| parent | a714ea5fa41623c8d8c42bed0dfb38a4d653451d (diff) | |
| download | op-kernel-dev-b779157dd3db6199b50e7ad64678a1ceedbeebcf.zip op-kernel-dev-b779157dd3db6199b50e7ad64678a1ceedbeebcf.tar.gz | |
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
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions
