summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2020-10-12 11:41:02 -0600
committerAlex Williamson <alex.williamson@redhat.com>2020-10-12 11:41:02 -0600
commit2099363255f123f6c9abcfa8531bbec65a8f1820 (patch)
tree5e035e7aee6f05c4954d149c4f85ef7b0b646982 /arch/s390
parent3de066f8f86bf3bc4921153ea952a60a11d9d94e (diff)
parentac93ab2bf69a5b7724106ec7ce852eff9c307510 (diff)
parentc10ff790c42e45abaf6f598ba53c9ff63198ecac (diff)
downloadlinux-2099363255f123f6c9abcfa8531bbec65a8f1820.tar.bz2
Merge branches 'v5.10/vfio/fsl-mc-v6' and 'v5.10/vfio/zpci-info-v3' into v5.10/vfio/next