diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-12 12:09:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-12 12:09:36 -0700 |
| commit | 407bc8d81837197ef02c7296f8068d3bf2c96f53 (patch) | |
| tree | 4d08d5006717e2874218029ca979c8cfb33d79c3 /drivers/watchdog/sbc60xxwdt.c | |
| parent | ea6ec774372740b024a6c27caac0d0af8960ea15 (diff) | |
| parent | ccd59dce1a21f473518bf273bdf5b182bab955b3 (diff) | |
Merge tag 'vfio-v5.9-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Inclusive naming updates (Alex Williamson)
- Intel X550 INTx quirk (Alex Williamson)
- Error path resched between unmaps (Xiang Zheng)
- SPAPR IOMMU pin_user_pages() conversion (John Hubbard)
- Trivial mutex simplification (Alex Williamson)
- QAT device denylist (Giovanni Cabiddu)
- type1 IOMMU ioctl refactor (Liu Yi L)
* tag 'vfio-v5.9-rc1' of git://github.com/awilliam/linux-vfio:
vfio/type1: Refactor vfio_iommu_type1_ioctl()
vfio/pci: Add QAT devices to denylist
vfio/pci: Add device denylist
PCI: Add Intel QuickAssist device IDs
vfio/pci: Hold igate across releasing eventfd contexts
vfio/spapr_tce: convert get_user_pages() --> pin_user_pages()
vfio/type1: Add conditional rescheduling after iommu map failed
vfio/pci: Add Intel X550 to hidden INTx devices
vfio: Cleanup allowed driver naming
Diffstat (limited to 'drivers/watchdog/sbc60xxwdt.c')
0 files changed, 0 insertions, 0 deletions