diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-19 20:00:41 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-19 20:00:41 +0100 |
commit | 9fe4d215c8360cde2876c5bf52f80920f8b4d68b (patch) | |
tree | 9f8f6629e7e39b4c7c64fc9a87d147a278060dd3 /kernel-s390x-zfcpdump-rhel.config | |
parent | d27b13cd6407c88d5f61c22d85551faf52b56093 (diff) | |
parent | eb496a694b14672dbcfbdac257b53f40dc619af9 (diff) | |
download | kernel-9fe4d215c8360cde2876c5bf52f80920f8b4d68b.tar.gz kernel-9fe4d215c8360cde2876c5bf52f80920f8b4d68b.tar.xz kernel-9fe4d215c8360cde2876c5bf52f80920f8b4d68b.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.vanilla.1.fc35kernel-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.vanilla.1.fc34kernel-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.vanilla.1.fc33kernel-5.12.0-0.rc3.20210319git8b12a62a4e3e.172.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1b5200090..0f12d627f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6013,7 +6013,7 @@ CONFIG_VEXPRESS_SYSCFG=y # CONFIG_VFAT_FS is not set CONFIG_VFIO_AP=m CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m +# CONFIG_VFIO is not set CONFIG_VFIO_MDEV_DEVICE=m CONFIG_VFIO_MDEV=m # CONFIG_VFIO_NOIOMMU is not set |