diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2020-10-12 19:41:02 +0200 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2020-10-12 19:41:02 +0200 |
commit | 2099363255f123f6c9abcfa8531bbec65a8f1820 (patch) | |
tree | 5e035e7aee6f05c4954d149c4f85ef7b0b646982 /drivers/vfio | |
parent | Merge branches 'v5.10/vfio/bardirty', 'v5.10/vfio/dma_avail', 'v5.10/vfio/mis... (diff) | |
parent | vfio/fsl-mc: Add support for device reset (diff) | |
parent | MAINTAINERS: Add entry for s390 vfio-pci (diff) | |
download | linux-2099363255f123f6c9abcfa8531bbec65a8f1820.tar.xz linux-2099363255f123f6c9abcfa8531bbec65a8f1820.zip |
Merge branches 'v5.10/vfio/fsl-mc-v6' and 'v5.10/vfio/zpci-info-v3' into v5.10/vfio/next