diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 08:50:56 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 08:50:56 +0900 |
| commit | 3dddebe059d81a39aa1135b6e6d18ebfa4d25384 (patch) | |
| tree | 6925b4a2de099ab2d679a038b9b6f1538701489f /block/compat_ioctl.c | |
| parent | e626d177fcb7d8eb759da49c652a68ff90a59fba (diff) | |
| parent | 899649b7d4ead76c19e39251ca886eebe3f811a8 (diff) | |
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
Diffstat (limited to 'block/compat_ioctl.c')
0 files changed, 0 insertions, 0 deletions