diff options
author | 2020-10-12 11:41:02 -0600 | |
---|---|---|
committer | 2020-10-12 11:41:02 -0600 | |
commit | 2099363255f123f6c9abcfa8531bbec65a8f1820 (patch) | |
tree | 5e035e7aee6f05c4954d149c4f85ef7b0b646982 /include/uapi/linux | |
parent | Merge branches 'v5.10/vfio/bardirty', 'v5.10/vfio/dma_avail', 'v5.10/vfio/misc', 'v5.10/vfio/no-cmd-mem' and 'v5.10/vfio/yan_zhao_fixes' into v5.10/vfio/next (diff) | |
parent | vfio/fsl-mc: Add support for device reset (diff) | |
parent | MAINTAINERS: Add entry for s390 vfio-pci (diff) | |
download | linux-dev-2099363255f123f6c9abcfa8531bbec65a8f1820.tar.xz linux-dev-2099363255f123f6c9abcfa8531bbec65a8f1820.zip |
Merge branches 'v5.10/vfio/fsl-mc-v6' and 'v5.10/vfio/zpci-info-v3' into v5.10/vfio/next