diff --git a/Makefile.rhelver b/Makefile.rhelver
index ff5ba11cd..66bed4c38 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 = 57
+RHEL_RELEASE = 58
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 28e70a9c3..ed57ca0d0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -654,8 +654,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2612,7 +2612,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2652,9 +2652,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2692,8 +2692,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3708,7 +3708,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3929,6 +3929,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -4008,7 +4009,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4297,7 +4298,7 @@ CONFIG_PCIE_IPROC=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_QCOM is not set
 CONFIG_PCIE_TEGRA194_HOST=y
 # CONFIG_PCIE_XILINX is not set
@@ -5237,7 +5238,7 @@ CONFIG_SENSORS_LM70=m
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-CONFIG_SENSORS_LM90=m
+# CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM95234 is not set
@@ -6174,11 +6175,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6328,7 +6329,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 # CONFIG_TEGRA186_GPC_DMA is not set
 CONFIG_TEGRA186_TIMER=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 2f7e33f22..d371b2ce2 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -654,8 +654,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2596,7 +2596,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2636,9 +2636,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2676,8 +2676,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3687,7 +3687,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3908,6 +3908,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3987,7 +3988,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4274,7 +4275,7 @@ CONFIG_PCIE_IPROC=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_QCOM is not set
 CONFIG_PCIE_TEGRA194_HOST=y
 # CONFIG_PCIE_XILINX is not set
@@ -5214,7 +5215,7 @@ CONFIG_SENSORS_LM70=m
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-CONFIG_SENSORS_LM90=m
+# CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM95234 is not set
@@ -6149,11 +6150,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6303,7 +6304,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 # CONFIG_TEGRA186_GPC_DMA is not set
 CONFIG_TEGRA186_TIMER=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 32bfad771..ef3a59fd4 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1197,8 +1197,8 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set
-CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y
+CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_DWARF5 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c9f6dc383..4f5f1782b 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -528,8 +528,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2411,7 +2411,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2452,9 +2452,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2492,8 +2492,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3498,7 +3498,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3716,6 +3716,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3791,7 +3792,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4066,7 +4067,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -5923,11 +5924,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6068,7 +6069,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index c0bdb610f..acfc20fcc 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -528,8 +528,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2395,7 +2395,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2436,9 +2436,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2476,8 +2476,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3478,7 +3478,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3696,6 +3696,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3771,7 +3772,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4045,7 +4046,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -5900,11 +5901,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6045,7 +6046,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index e8b6da84f..a8b1e713d 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -526,8 +526,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BSD_DISKLABEL=y
@@ -2396,7 +2396,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2436,9 +2436,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2476,8 +2476,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3482,7 +3482,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3700,6 +3700,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3775,7 +3776,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4048,7 +4049,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_PCIEPORTBUS is not set
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -5899,11 +5900,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6042,7 +6043,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index f7cb6841b..c507046f4 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -526,8 +526,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BROADCOM_PHY is not set
 CONFIG_BSD_DISKLABEL=y
@@ -2380,7 +2380,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2420,9 +2420,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2460,8 +2460,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3462,7 +3462,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3680,6 +3680,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3755,7 +3756,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4027,7 +4028,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_PCIEPORTBUS is not set
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -5876,11 +5877,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6019,7 +6020,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 974b38e10..3b8fc8e2c 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -530,8 +530,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_BRIDGE is not set
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BSD_DISKLABEL is not set
@@ -2391,7 +2391,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2431,9 +2431,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2471,8 +2471,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3475,7 +3475,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3694,6 +3694,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3769,7 +3770,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4041,7 +4042,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_PCIEPORTBUS is not set
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -5897,11 +5898,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6044,7 +6045,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index fb19e8b86..8b61bf9b6 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -553,8 +553,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2575,7 +2575,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2615,9 +2615,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2655,8 +2655,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3675,7 +3675,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3892,6 +3892,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3967,7 +3968,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4255,7 +4256,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -6134,11 +6135,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6290,7 +6291,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 7709b4382..19377b357 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -553,8 +553,8 @@ CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE=m
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_BRIDGE_NF_EBTABLES=m
+# CONFIG_BRIDGE_NETFILTER is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
@@ -2559,7 +2559,7 @@ CONFIG_IOSM=m
 # CONFIG_IO_URING is not set
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -2599,9 +2599,9 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_IPTABLES is not set
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -2639,8 +2639,8 @@ CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
 CONFIG_IP_SET_HASH_NETPORT=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
+# CONFIG_IP_SET is not set
 CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IPV6_GRE=m
 # CONFIG_IPV6_ILA is not set
@@ -3655,7 +3655,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 # CONFIG_NETFILTER_XTABLES_COMPAT is not set
-CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XTABLES is not set
 CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -3872,6 +3872,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
@@ -3947,7 +3948,7 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CT=m
@@ -4234,7 +4235,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_PTM is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
@@ -6110,11 +6111,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6266,7 +6267,7 @@ CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
-CONFIG_TDX_GUEST_DRIVER=m
+# CONFIG_TDX_GUEST_DRIVER is not set
 CONFIG_TEE=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel.spec b/kernel.spec
index f0375da15..9bc6b1adb 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -35,6 +35,18 @@
 %global buildroot %{_buildrootdir}/%{NAME}-%{VERSION}-%{RELEASE}.%{_build_cpu}
 %endif
 
+# RPM macros strip everything in BUILDROOT, either with __strip
+# or find-debuginfo.sh. Make use of __spec_install_post override
+# and save/restore binaries we want to package as unstripped.
+%define buildroot_unstripped %{_builddir}/root_unstripped
+%define buildroot_save_unstripped() \
+(cd %{buildroot}; cp -rav --parents -t %{buildroot_unstripped}/ %1 || true) \
+%{nil}
+%define __restore_unstripped_root_post \
+    echo "Restoring unstripped artefacts %{buildroot_unstripped} -> %{buildroot}" \
+    cp -rav %{buildroot_unstripped}/. %{buildroot}/ \
+%{nil}
+
 # The kernel's %%install section is special
 # Normally the %%install section starts by cleaning up the BUILD_ROOT
 # like so:
@@ -135,13 +147,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.2.0
 %define patchversion 6.2
-%define pkgrelease 0.rc8.57
+%define pkgrelease 0.rc8.20230214gitf6feea56f66d.58
 %define kversion 6
-%define tarfile_release 6.2-rc8
+%define tarfile_release 6.2-rc8-15-gf6feea56f66d
 # This is needed to do merge window version magic
 %define patchlevel 2
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc8.57%{?buildid}%{?dist}
+%define specrelease 0.rc8.20230214gitf6feea56f66d.58%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.2.0
 
@@ -1650,6 +1662,9 @@ cd ..
 ###
 %build
 
+rm -rf %{buildroot_unstripped} || true
+mkdir -p %{buildroot_unstripped}
+
 %if %{with_sparse}
 %define sparse_mflags	C=1
 %endif
@@ -2508,6 +2523,7 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
 		-name '*.o' -exec sh -c 'readelf -h "{}" | grep -q "^  Machine:.*BPF"' \; \) -print0 | \
 	xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true
 done
+%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
 popd
 export -n BPFTOOL
 %endif
@@ -2584,6 +2600,7 @@ find Documentation -type d | xargs chmod u+w
   %{__arch_install_post}\
   %{__os_install_post}\
   %{__remove_unwanted_dbginfo_install_post}\
+  %{__restore_unstripped_root_post}\
   %{__modsign_install_post}
 
 ###
@@ -3326,9 +3343,18 @@ fi
 #
 #
 %changelog
-* Mon Feb 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc8.57]
+* Tue Feb 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc8.f6feea56f66d.58]
 - Disable frame pointers (Justin M. Forbes)
 
+* Tue Feb 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc8.f6feea56f66d.57]
+- redhat/configs: update scripts and docs for ark -> rhel rename (Clark Williams)
+- redhat/configs: rename ark configs dir to rhel (Clark Williams)
+- Turn off CONFIG_DEBUG_INFO_COMPRESSED_ZLIB for ppc64le (Justin M. Forbes)
+- kernel.spec: package unstripped kselftests/bpf/test_progs (Jan Stancek)
+- kernel.spec: allow to package some binaries as unstripped (Jan Stancek)
+- redhat/configs: Make merge.py portable for older python (Desnes Nunes)
+- Linux v6.2.0-0.rc8.f6feea56f66d
+
 * Mon Feb 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc8.56]
 - Linux v6.2.0-0.rc8
 
diff --git a/merge.py b/merge.py
index e1d0efdae..b68bbe98c 100755
--- a/merge.py
+++ b/merge.py
@@ -32,10 +32,14 @@ notset = re.compile(r'^#\s+(CONFIG_\w+)\s+is not set')
 # if we get a match return the config that is being changed
 def find_config(line):
     '''find a configuration line in the input and return the config name'''
-    if m := isset.match(line):
+    m = isset.match(line)
+    if (m is not None):
         return m.group(1)
-    if m := notset.match(line):
+
+    m = notset.match(line)
+    if (m is not None):
         return m.group(1)
+
     return None
 
 #########################################################
diff --git a/process_configs.sh b/process_configs.sh
index dd134a569..b7bce2454 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -387,15 +387,15 @@ do
 done
 
 KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
-FLAVOR="$(test -n "$2" && echo "-$2" || echo "-ark")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo "-rhel")"
 # shellcheck disable=SC2015
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
-# Config options for RHEL should target the pending-ark directory, not pending-common.
+# Config options for RHEL should target the pending-rhel directory, not pending-common.
 if [ "$FLAVOR" = "-rhel" ]
 then
-	FLAVOR="-ark"
+	FLAVOR="-rhel"
 fi
 
 # to handle this script being a symlink
diff --git a/sources b/sources
index f81235b7d..fde37b478 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.2-rc8.tar.xz) = 7be3e8b6f48f97b8b14b488d89957d9c89863d9952c5706f067f90750eb3de747a0afe02b6e48a113a0c2533347d2a2f30a046b5b6a5cd159ea17f2b7a8dd20b
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = dde1f5835d29d1547a8899d073c8fb6da58b55a36ba416adaefed50591c4db3cdcebd6d7fc31455c5d94a32aeeb26b2f6c70ab2c779a0fc4f9b57a27427ba988
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 740cf02c0aee7c547bbd5d2ac5c936dce9020ae7ebc2016603ad7c493ad8e76f5e4c3f6dac6b499673d3e472fc8675d1748192c580781923db67405c82a308cf
+SHA512 (linux-6.2-rc8-15-gf6feea56f66d.tar.xz) = d7b890aec904ef3fd40eed47f9ae73c935872a1eca36556294db313c31dbbab6db86d33d1247362c885ba6fd0c99361147a9ee1b34c39916f82a691a744fca08
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 671dfe2abed7bdeaa8692c2f7a7da4218bc10b7322ab4227e90e8406e4cc1de1e63f6d427eec775365350dca2e9b1a1b8b31a7df6cd3d8dd40c9c56ce44f7453
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 376311f33dc6feab7aca5c8b078d997c77945570acb934ea40bc981f69f5053777746881e41e48ec7fb4c7a84a28e0d400716c0373919343525ab43ae5e16a08