diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-19 06:20:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-19 06:20:22 +0200 |
commit | 350e8a861d7a44bac1f3f81b735c62c1e83d8506 (patch) | |
tree | 756a117adeed0c005ed4ce085a8245965ff7f4fa /kernel-s390x-debug-rhel.config | |
parent | 5b38c35d56d66c46ac0df614dc8ead9d814109e1 (diff) | |
parent | f6a7d883a83dd7e8f43c1ae26cebec8db46a7732 (diff) | |
download | kernel-350e8a861d7a44bac1f3f81b735c62c1e83d8506.tar.gz kernel-350e8a861d7a44bac1f3f81b735c62c1e83d8506.tar.xz kernel-350e8a861d7a44bac1f3f81b735c62c1e83d8506.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc2.20210518git8ac91e6c6033.21.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-debug-rhel.config')
-rw-r--r-- | kernel-s390x-debug-rhel.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 131c6f477..697fcad2a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1109,7 +1109,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y # CONFIG_DM_UNSTRIPED is not set -# CONFIG_DM_VERITY_FEC is not set +CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y CONFIG_DM_WRITECACHE=m @@ -1163,7 +1163,7 @@ CONFIG_DRM_DP_CEC=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_GM12U320=m -# CONFIG_DRM_GUD is not set +CONFIG_DRM_GUD=m # CONFIG_DRM_HDLCD is not set # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set @@ -5722,7 +5722,7 @@ CONFIG_UHID=m # CONFIG_UIO_MF624 is not set # CONFIG_UIO_NETX is not set # CONFIG_UIO_PCI_GENERIC is not set -CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_PRUSS is not set # CONFIG_UIO_SERCOS3 is not set # CONFIG_ULTRIX_PARTITION is not set |