summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2023-01-30 17:28:25 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2023-01-30 17:28:25 +0100
commit98103099fa09038c128dbb5c73ef988743f36b3c (patch)
treea24f6b282332c56ec6908cc730db8df301516d91 /kernel-s390x-rhel.config
parentd14d7db6947365cb0e615aedea8cede8f6bcc510 (diff)
parentb19a5698c95c95f50ea96f25805ee95c5b32ded7 (diff)
downloadkernel-98103099fa09038c128dbb5c73ef988743f36b3c.tar.gz
kernel-98103099fa09038c128dbb5c73ef988743f36b3c.tar.xz
kernel-98103099fa09038c128dbb5c73ef988743f36b3c.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc6.44.vanilla.1.fc38kernel-6.2.0-0.rc6.44.vanilla.1.fc37kernel-6.2.0-0.rc6.44.vanilla.1.fc36
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index d9b3960c0..14c34484c 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -938,7 +938,6 @@ CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS_NAME="Linux Kernel Cryptographic API"
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_GHASH_S390=m
CONFIG_CRYPTO_GHASH=y
# CONFIG_CRYPTO_HCTR2 is not set
@@ -1503,13 +1502,12 @@ CONFIG_EFI_COCO_SECRET=y
CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
# CONFIG_EFI_DISABLE_PCI_DMA is not set
# CONFIG_EFI_DISABLE_RUNTIME is not set
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
CONFIG_EFI_HANDOVER_PROTOCOL=y
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_STUB=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
@@ -2998,6 +2996,7 @@ CONFIG_MEMBARRIER=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y
CONFIG_MEMCPY_KUNIT_TEST=m
+CONFIG_MEMCPY_SLOW_KUNIT_TEST=y
CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
CONFIG_MEMORY_HOTPLUG=y