summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2021-08-26 20:08:50 +0300
committerAlex Williamson <alex.williamson@redhat.com>2021-08-26 20:08:50 +0300
commitea870730d83fc13a5fa2bd0e175176d7ac8a400a (patch)
treed798029b6eb9d9c1b4e688688f909729131770f6 /drivers/vfio
parent29848a034ac749622f5ef4686f9e48d69254f4dc (diff)
parentffc95d1b8edb80d2dab77f2e8a823c8d93b06419 (diff)
parent7fa005caa35ed92563b9e9d88d319b2623763a77 (diff)
parenteb0feefd4c025b2697464d141f7ff178095f34df (diff)
downloadlinux-ea870730d83fc13a5fa2bd0e175176d7ac8a400a.tar.xz
Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next