From f1d22013a4efa43f188cac6300d3945a423ec49a Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 5 Aug 2021 15:41:43 -0500
Subject: kernel-5.14.0-0.rc4.20210805git251a1524293d.37

* Thu Aug 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.20210805git251a1524293d.37]
- common: Update for CXL (Compute Express Link) configs (Peter Robinson)
- redhat: configs: disable CRYPTO_SM modules (Herton R. Krzesinski) [1990040]
- Remove fedora version of the LOCKDEP_BITS, we should use common (Justin M. Forbes)
- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes)
Resolves: rhbz#1990040

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver                        |  2 +-
 kernel-aarch64-debug-fedora.config      | 18 +++++++++---------
 kernel-aarch64-debug-rhel.config        | 12 ++++++------
 kernel-aarch64-fedora.config            | 18 +++++++++---------
 kernel-aarch64-rhel.config              | 12 ++++++------
 kernel-armv7hl-debug-fedora.config      | 14 +++++++-------
 kernel-armv7hl-fedora.config            | 14 +++++++-------
 kernel-armv7hl-lpae-debug-fedora.config | 14 +++++++-------
 kernel-armv7hl-lpae-fedora.config       | 14 +++++++-------
 kernel-i686-debug-fedora.config         | 14 +++++++-------
 kernel-i686-fedora.config               | 14 +++++++-------
 kernel-ppc64le-debug-fedora.config      | 12 ++++++------
 kernel-ppc64le-debug-rhel.config        |  8 ++++----
 kernel-ppc64le-fedora.config            | 12 ++++++------
 kernel-ppc64le-rhel.config              |  8 ++++----
 kernel-s390x-debug-fedora.config        | 12 ++++++------
 kernel-s390x-debug-rhel.config          |  8 ++++----
 kernel-s390x-fedora.config              | 12 ++++++------
 kernel-s390x-rhel.config                |  8 ++++----
 kernel-s390x-zfcpdump-rhel.config       |  8 ++++----
 kernel-x86_64-debug-fedora.config       | 14 +++++++-------
 kernel-x86_64-debug-rhel.config         |  8 ++++----
 kernel-x86_64-fedora.config             | 14 +++++++-------
 kernel-x86_64-rhel.config               |  8 ++++----
 kernel.spec                             | 18 ++++++++++++------
 sources                                 |  6 +++---
 26 files changed, 154 insertions(+), 148 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 83e59c409..e0f11f38d 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 36
+RHEL_RELEASE = 37
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 37761fb24..eefe31fa1 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1315,7 +1315,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_DEBUGFS=y
 CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
@@ -1436,11 +1436,11 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1468,8 +1468,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3598,7 +3598,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 66cde9685..3c350f300 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1070,11 +1070,11 @@ CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3522,7 +3522,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index c152120ec..f40b16e00 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1315,7 +1315,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
@@ -1436,11 +1436,11 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1468,8 +1468,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3576,7 +3576,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index f2fdbb74c..d87f59a8a 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1070,11 +1070,11 @@ CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3502,7 +3502,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index a1e0765ad..9272f89d4 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1303,7 +1303,7 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_CCP_DEBUGFS=y
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1427,9 +1427,9 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1457,8 +1457,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3635,7 +3635,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index b4f396aba..b018b367f 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1303,7 +1303,7 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1427,9 +1427,9 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1457,8 +1457,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3614,7 +3614,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b96169753..0f369a6e1 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1274,7 +1274,7 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_CCP_DEBUGFS=y
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1397,9 +1397,9 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1427,8 +1427,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3561,7 +3561,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 51ae01afa..ea0971b35 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1274,7 +1274,7 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_CCREE=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1397,9 +1397,9 @@ CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1427,8 +1427,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3540,7 +3540,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index db4842fdc..30d10f68f 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1132,9 +1132,9 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1165,8 +1165,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3255,7 +3255,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -3734,7 +3734,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 # CONFIG_MOUSE_VSXXXAA is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 308c5d0ef..a7847a2c2 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1131,9 +1131,9 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1164,8 +1164,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3233,7 +3233,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -3712,7 +3712,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 # CONFIG_MOUSE_VSXXXAA is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 3ff8ee0cc..aa7d46ae5 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1072,9 +1072,9 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1103,8 +1103,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXLFLASH=m
 CONFIG_CXL=m
 CONFIG_CXL_MEM=m
@@ -3017,7 +3017,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_PPC_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 58dbcab1e..874a4ec01 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -915,9 +915,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3340,7 +3340,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 752a3dfe9..a1b3c027f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1071,9 +1071,9 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1102,8 +1102,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXLFLASH=m
 CONFIG_CXL=m
 CONFIG_CXL_MEM=m
@@ -2995,7 +2995,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_PPC_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index d1637c237..f116ec896 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -915,9 +915,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3323,7 +3323,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index e42da0423..f1b225521 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1079,9 +1079,9 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1110,8 +1110,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -2992,7 +2992,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_IPL_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 4b0173fcb..2f80231f1 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -918,9 +918,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3321,7 +3321,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index d1af2cc16..9eeb88416 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1078,9 +1078,9 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1109,8 +1109,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -2970,7 +2970,7 @@ CONFIG_LMP91000=m
 CONFIG_LOAD_IPL_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index a4490f262..852752021 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -918,9 +918,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3304,7 +3304,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 48744647b..2c89adaf7 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -923,9 +923,9 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_S390=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=y
-CONFIG_CRYPTO_SM3=y
-CONFIG_CRYPTO_SM4=y
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3325,7 +3325,7 @@ CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER is not set
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 7f220d383..d8862bd19 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1171,9 +1171,9 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1204,8 +1204,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3311,7 +3311,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -3782,7 +3782,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 # CONFIG_MOUSE_VSXXXAA is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index f2b9a1059..1d36f5642 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -978,9 +978,9 @@ CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3537,7 +3537,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f69f6dfde..7ed3a587c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1170,9 +1170,9 @@ CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_STREEBOG=m
 # CONFIG_CRYPTO_TEA is not set
@@ -1203,8 +1203,8 @@ CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_CXD2880_SPI_DRV=m
 # CONFIG_CX_ECAT is not set
-CONFIG_CXL_ACPI=m
-CONFIG_CXL_BUS=m
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_BUS=y
 CONFIG_CXL_MEM=m
 # CONFIG_CXL_MEM_RAW_COMMANDS is not set
 CONFIG_CXL_PMEM=m
@@ -3289,7 +3289,7 @@ CONFIG_LLC=m
 CONFIG_LMP91000=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=15
+CONFIG_LOCKDEP_BITS=16
 CONFIG_LOCKDEP_CHAINS_BITS=16
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -3760,7 +3760,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_VMMOUSE=y
 CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 # CONFIG_MOUSE_VSXXXAA is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 4b59a9103..42ed082c6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -978,9 +978,9 @@ CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-CONFIG_CRYPTO_SM2=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_SM4=m
+# CONFIG_CRYPTO_SM2 is not set
+# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM4 is not set
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
@@ -3518,7 +3518,7 @@ CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-# CONFIG_NETFILTER_NETLINK_HOOK is not set
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
diff --git a/kernel.spec b/kernel.spec
index 7aa77e794..75f77ac8f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0
 
-%global distro_build 0.rc4.20210804gitd5ad8ec3cfb5.36
+%global distro_build 0.rc4.20210805git251a1524293d.37
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 0.rc4.20210804gitd5ad8ec3cfb5.36
+%define pkgrelease 0.rc4.20210805git251a1524293d.37
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20210804gitd5ad8ec3cfb5.36%{?buildid}%{?dist}
+%define specrelease 0.rc4.20210805git251a1524293d.37%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -671,7 +671,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc4-11-gd5ad8ec3cfb5.tar.xz
+Source0: linux-5.14-rc4-22-g251a1524293d.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1357,8 +1357,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14-rc4-11-gd5ad8ec3cfb5 -c
-mv linux-5.14-rc4-11-gd5ad8ec3cfb5 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc4-22-g251a1524293d -c
+mv linux-5.14-rc4-22-g251a1524293d linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2952,6 +2952,12 @@ fi
 #
 #
 %changelog
+* Thu Aug 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.20210805git251a1524293d.37]
+- common: Update for CXL (Compute Express Link) configs (Peter Robinson)
+- redhat: configs: disable CRYPTO_SM modules (Herton R. Krzesinski) [1990040]
+- Remove fedora version of the LOCKDEP_BITS, we should use common (Justin M. Forbes)
+- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes)
+
 * Wed Aug 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.20210804gitd5ad8ec3cfb5.36]
 - Revert "Merge branch 'releasefix' into 'os-build'" (Justin M. Forbes)
 - Fedora 5.14 configs round 1 (Justin M. Forbes)
diff --git a/sources b/sources
index 68f8b080b..92a47309a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.14-rc4-11-gd5ad8ec3cfb5.tar.xz) = 895d7a9f6e406b69575daeeee6e12c1d68b1d2fbfaab005aaffb984cefe8599776a45974c94a5b424ad0cffc1aa5637610a4ee2c29deb7f777e4294c94a39fd0
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc4.20210804gitd5ad8ec3cfb5.36.tar.bz2) = e5c492d1f3db3f8137217909f4af17fc2935cceb7249806706f4356c09b6a27a7fa3fc3bba02e5b9b9992a2a177fdcf421e955660f276ed4c0ad557dbe91d231
-SHA512 (kernel-kabi-dw-5.14.0-0.rc4.20210804gitd5ad8ec3cfb5.36.tar.bz2) = 4f8167606b85f7e15f7528e959345297f93eddba03c2ed0b95349eb92398e7db3ef40ac6e1486a6a421fe0080d81c2342293e69af364afe62e0c4889360886d6
+SHA512 (linux-5.14-rc4-22-g251a1524293d.tar.xz) = 044bc0ad508f2f27c327b74061e1155ace5b190845417fc7c75676649c74ae8481d7b190122cf04c6c84c5df95548dbb22fee035827e87746b158553109bc214
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc4.20210805git251a1524293d.37.tar.bz2) = 2b11caa911c84f82a6c70e9169f12e61b58451516aa260f030d5943ab6f17c3ae5bca7b8677d739d3a2190be33b1e39249985f3db1304342ae346a4dbd23cd00
+SHA512 (kernel-kabi-dw-5.14.0-0.rc4.20210805git251a1524293d.37.tar.bz2) = 3193824dc4eb513b18e8e28538992acf9be3126b5dc62796cad3e6e554c37e4245131f0cab85cad09e9f7b2edb398d660294c74eaa4a0af4db52f908f77df5a8
-- 
cgit