diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-14 06:00:50 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-14 06:00:50 +0200 |
commit | ab4617379514cd5ab6c6c0d188558d4f64c8c245 (patch) | |
tree | b00d030136013f64f68998b2219b620f6dfe11ac /kernel-s390x-rhel.config | |
parent | 57a91801a8bb6d5e056a9135fa92b491dc4a14b6 (diff) | |
parent | c7a02e59b4df57ed3fe16ccba32d11cebd667d90 (diff) | |
download | kernel-ab4617379514cd5ab6c6c0d188558d4f64c8c245.tar.gz kernel-ab4617379514cd5ab6c6c0d188558d4f64c8c245.tar.xz kernel-ab4617379514cd5ab6c6c0d188558d4f64c8c245.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc2.21.vanilla.1.fc37kernel-5.19.0-0.rc2.21.vanilla.1.fc36kernel-5.19.0-0.rc2.21.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ce82fcad2..a3b05eec1 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1639,7 +1639,7 @@ CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y -# CONFIG_FW_UPLOAD is not set +CONFIG_FW_UPLOAD=y # CONFIG_FXAS21002C is not set # CONFIG_FXLS8962AF_I2C is not set # CONFIG_FXLS8962AF_SPI is not set @@ -6686,6 +6686,7 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_SCRUB_PAGES_DEFAULT=y # CONFIG_XEN_SCSI_FRONTEND is not set # CONFIG_XEN_UNPOPULATED_ALLOC is not set +# CONFIG_XEN_VIRTIO is not set CONFIG_XFRM_INTERFACE=m CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_OFFLOAD=y |