summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2022-07-08 00:05:13 +0300
committerAlex Williamson <alex.williamson@redhat.com>2022-07-08 00:05:13 +0300
commit2a8ed7ef00b939fbcc98b948f780bd03bafed227 (patch)
tree311a41dbcdd44fd81a15f9b9e4c6c591e5782307 /drivers/vfio
parentff4f65e4ddcebb96bee503e644160b1f9d57dbac (diff)
parent6577067d7f044923aa26129766d6b457030a251b (diff)
parent204b394a23ad5e30944f23518e21e844614da2ff (diff)
downloadlinux-2a8ed7ef00b939fbcc98b948f780bd03bafed227.tar.xz
Merge branches 'v5.20/vfio/spapr_tce-unused-arg-v1', 'v5.20/vfio/comment-typo-v1' and 'v5.20/vfio/vfio-ccw-rework-v4' into v5.20/vfio/next