diff --git a/Makefile.rhelver b/Makefile.rhelver
index b76e2d6f2..23b12db02 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 = 10
+RHEL_RELEASE = 11
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index e6d1beab8..b290f1069 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -6048,8 +6048,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
+CONFIG_PAGE_BLOCK_MAX_ORDER=11
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8508,7 +8507,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index 6005f5344..57d383e1e 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -6021,8 +6021,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
+CONFIG_PAGE_BLOCK_MAX_ORDER=11
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8478,7 +8477,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index c83183362..7c822a9ac 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -4973,8 +4973,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6892,7 +6891,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index ee856ce0e..81683defa 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -4952,8 +4952,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6867,7 +6866,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index e5a419fbd..ddb84fa4f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6049,7 +6049,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8507,7 +8506,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 50bda59bb..10b6c3172 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4972,7 +4972,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6889,7 +6888,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 20387d343..af57304dd 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6022,7 +6022,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8477,7 +8476,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 990a2d900..fc101ae72 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4951,7 +4951,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6864,7 +6863,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config
index 101667f2f..0fcc2e71b 100644
--- a/kernel-aarch64-rt-64k-debug-fedora.config
+++ b/kernel-aarch64-rt-64k-debug-fedora.config
@@ -6056,8 +6056,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8521,7 +8520,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-64k-debug-rhel.config b/kernel-aarch64-rt-64k-debug-rhel.config
index adb086c6c..5dcc68f8f 100644
--- a/kernel-aarch64-rt-64k-debug-rhel.config
+++ b/kernel-aarch64-rt-64k-debug-rhel.config
@@ -5015,8 +5015,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6938,7 +6937,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config
index 58086acd0..7d432ef5a 100644
--- a/kernel-aarch64-rt-64k-fedora.config
+++ b/kernel-aarch64-rt-64k-fedora.config
@@ -6029,8 +6029,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8491,7 +8490,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-64k-rhel.config b/kernel-aarch64-rt-64k-rhel.config
index e031427a4..01e2ab3ad 100644
--- a/kernel-aarch64-rt-64k-rhel.config
+++ b/kernel-aarch64-rt-64k-rhel.config
@@ -4994,8 +4994,7 @@ CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
-CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=13
+CONFIG_PAGE_BLOCK_MAX_ORDER=13
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6913,7 +6912,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config
index 6844acda3..a26920565 100644
--- a/kernel-aarch64-rt-debug-fedora.config
+++ b/kernel-aarch64-rt-debug-fedora.config
@@ -6054,7 +6054,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8517,7 +8516,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index f6b22eafa..b765b8fa1 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -5013,7 +5013,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6934,7 +6933,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config
index 619af0cae..ceeb0dd4f 100644
--- a/kernel-aarch64-rt-fedora.config
+++ b/kernel-aarch64-rt-fedora.config
@@ -6027,7 +6027,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -8487,7 +8486,6 @@ CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index e5e380b5c..25e3dfcc1 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -4992,7 +4992,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6909,7 +6908,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index e3e9b5037..60b619b70 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5017,7 +5017,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=8
-CONFIG_PAGE_BLOCK_ORDER=8
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6905,7 +6904,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 602df28a5..a4631a26f 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4541,7 +4541,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=8
-CONFIG_PAGE_BLOCK_ORDER=8
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6356,7 +6355,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 78fcdd044..6ba55b36c 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4989,7 +4989,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=8
-CONFIG_PAGE_BLOCK_ORDER=8
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6874,7 +6873,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 307cdf07d..00be89d77 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4521,7 +4521,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=8
-CONFIG_PAGE_BLOCK_ORDER=8
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6333,7 +6332,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 5058efd0f..6c09b1017 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -5046,7 +5046,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6990,7 +6989,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-debug-rhel.config b/kernel-riscv64-debug-rhel.config
index 27b983103..eb2094b99 100644
--- a/kernel-riscv64-debug-rhel.config
+++ b/kernel-riscv64-debug-rhel.config
@@ -4502,7 +4502,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6286,7 +6285,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index bf9a1bdfb..5e7c8ec8b 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -5018,7 +5018,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6959,7 +6958,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-rhel.config b/kernel-riscv64-rhel.config
index 0a09e9edc..38e940b29 100644
--- a/kernel-riscv64-rhel.config
+++ b/kernel-riscv64-rhel.config
@@ -4482,7 +4482,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6263,7 +6262,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config
index 2e0f149c5..db3c3f175 100644
--- a/kernel-riscv64-rt-debug-fedora.config
+++ b/kernel-riscv64-rt-debug-fedora.config
@@ -5051,7 +5051,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -7000,7 +6999,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config
index 86c23cb41..504ed03cf 100644
--- a/kernel-riscv64-rt-fedora.config
+++ b/kernel-riscv64-rt-fedora.config
@@ -5023,7 +5023,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6969,7 +6968,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 84c1f13d1..c23e65027 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4991,7 +4991,6 @@ CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6848,7 +6847,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2b8765081..c4661c6c0 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4523,7 +4523,6 @@ CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6333,7 +6332,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index a05250de7..1f638b04d 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4963,7 +4963,6 @@ CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6817,7 +6816,6 @@ CONFIG_SND_SOC_IDT821034=m
 # CONFIG_SND_SOC_IMX_SGTL5000 is not set
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 61010a867..cd368e569 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4503,7 +4503,6 @@ CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6310,7 +6309,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 64bea46e6..a57bc95f9 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4514,7 +4514,6 @@ CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 CONFIG_PAGE_POISONING=y
@@ -6326,7 +6325,6 @@ CONFIG_SND_SOC_CX2072X=m
 # CONFIG_SND_SOC_IMX_SPDIF is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE is not set
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set
 # CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a1023e50d..f8fcd6321 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5445,7 +5445,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -7442,7 +7441,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index e30a91b89..eaa788886 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4813,7 +4813,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6715,7 +6714,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index b011e0cce..95aa42f95 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5419,7 +5419,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -7412,7 +7411,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 37b6eb38f..e46f0a776 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4793,7 +4793,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6691,7 +6690,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config
index 8e6ceac8a..f194baa98 100644
--- a/kernel-x86_64-rt-debug-fedora.config
+++ b/kernel-x86_64-rt-debug-fedora.config
@@ -5450,7 +5450,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -7452,7 +7451,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 3027038c6..17f9281d1 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -4854,7 +4854,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6760,7 +6759,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config
index 58ceb3e53..c5e96f8d6 100644
--- a/kernel-x86_64-rt-fedora.config
+++ b/kernel-x86_64-rt-fedora.config
@@ -5424,7 +5424,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -7422,7 +7421,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 0e37d512f..7c1e8f1f3 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -4834,7 +4834,6 @@ CONFIG_PACKET=y
 CONFIG_PACKING_KUNIT_TEST=m
 CONFIG_PACKING=y
 CONFIG_PAGE_BLOCK_MAX_ORDER=10
-CONFIG_PAGE_BLOCK_ORDER=10
 CONFIG_PAGE_EXTENSION=y
 CONFIG_PAGE_OWNER=y
 CONFIG_PAGE_POISONING=y
@@ -6736,7 +6735,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514=m
-# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640 is not set
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5640=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
diff --git a/kernel.changelog b/kernel.changelog
index 9417167b7..2275b03db 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,7 +1,13 @@
-* Mon Aug 04 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.d2eedaa3909b.10]
+* Tue Aug 05 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.7e161a991ea7.11]
 - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver)
 Resolves: 
 
+* Tue Aug 05 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.7e161a991ea7.10]
+- rename CONFIG_PAGE_BLOCK_ORDER to CONFIG_PAGE_BLOCK_MAX_ORDER (Justin M. Forbes)
+- kernel.spec: add '-e' option to %%preun for kernel-core and kernel-uki-virt (Xuemin Li)
+- Linux v6.17.0-0.rc0.7e161a991ea7
+Resolves: 
+
 * Mon Aug 04 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.d2eedaa3909b.9]
 - Remove CONFIG_TEST_MISC_MINOR as deps are no longer met (Justin M. Forbes)
 - Linux v6.17.0-0.rc0.d2eedaa3909b
diff --git a/kernel.spec b/kernel.spec
index 09bd41503..9043d1e4a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -165,13 +165,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.17.0
 %define specversion 6.17.0
 %define patchversion 6.17
-%define pkgrelease 0.rc0.250804gd2eedaa3909b.10
+%define pkgrelease 0.rc0.250805g7e161a991ea7.11
 %define kversion 6
-%define tarfile_release 6.16-11489-gd2eedaa3909b
+%define tarfile_release 6.16-11699-g7e161a991ea7
 # This is needed to do merge window version magic
 %define patchlevel 17
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.250804gd2eedaa3909b.10%{?buildid}%{?dist}
+%define specrelease 0.rc0.250805g7e161a991ea7.11%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.17.0
 
@@ -3889,11 +3889,18 @@ touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?-v:+%
 
 #
 # This macro defines a %%preun script for a kernel package.
-#	%%kernel_variant_preun [-v <subpackage>] -u [uki-suffix]
+#	%%kernel_variant_preun [-v <subpackage>] -u [uki-suffix] -e
+# Add kernel-install's --entry-type=type1|type2|all option (if supported) to limit removal
+# to a specific boot entry type.
 #
-%define kernel_variant_preun(v:u:) \
+%define kernel_variant_preun(v:u:e) \
 %{expand:%%preun %{?-v:%{-v*}-}%{!?-u*:core}%{?-u*:uki-%{-u*}}}\
-/bin/kernel-install remove %{KVERREL}%{?-v:+%{-v*}} || exit $?\
+entry_type=""\
+%{-e: \
+/bin/kernel-install --help|grep -q -- '--entry-type=' &&\
+    entry_type="--entry-type %{!?-u:type1}%{?-u:type2}" \
+}\
+/bin/kernel-install remove %{KVERREL}%{?-v:+%{-v*}} $entry_type || exit $?\
 %if !%{with_automotive}\
 if [ -x %{_sbindir}/weak-modules ]\
 then\
@@ -3904,11 +3911,11 @@ fi\
 
 %if %{with_up_base} && %{with_efiuki}
 %kernel_variant_posttrans -u virt
-%kernel_variant_preun -u virt
+%kernel_variant_preun -u virt -e
 %endif
 
 %if %{with_up_base}
-%kernel_variant_preun
+%kernel_variant_preun -e
 %kernel_variant_post
 %endif
 
@@ -3919,52 +3926,52 @@ fi\
 
 %if %{with_up} && %{with_debug} && %{with_efiuki}
 %kernel_variant_posttrans -v debug -u virt
-%kernel_variant_preun -v debug -u virt
+%kernel_variant_preun -v debug -u virt -e
 %endif
 
 %if %{with_up} && %{with_debug}
-%kernel_variant_preun -v debug
+%kernel_variant_preun -v debug -e
 %kernel_variant_post -v debug
 %endif
 
 %if %{with_arm64_16k_base}
-%kernel_variant_preun -v 16k
+%kernel_variant_preun -v 16k -e
 %kernel_variant_post -v 16k
 %endif
 
 %if %{with_debug} && %{with_arm64_16k}
-%kernel_variant_preun -v 16k-debug
+%kernel_variant_preun -v 16k-debug -e
 %kernel_variant_post -v 16k-debug
 %endif
 
 %if %{with_arm64_16k} && %{with_debug} && %{with_efiuki}
 %kernel_variant_posttrans -v 16k-debug -u virt
-%kernel_variant_preun -v 16k-debug -u virt
+%kernel_variant_preun -v 16k-debug -u virt -e
 %endif
 
 %if %{with_arm64_16k_base} && %{with_efiuki}
 %kernel_variant_posttrans -v 16k -u virt
-%kernel_variant_preun -v 16k -u virt
+%kernel_variant_preun -v 16k -u virt -e
 %endif
 
 %if %{with_arm64_64k_base}
-%kernel_variant_preun -v 64k
+%kernel_variant_preun -v 64k -e
 %kernel_variant_post -v 64k
 %endif
 
 %if %{with_debug} && %{with_arm64_64k}
-%kernel_variant_preun -v 64k-debug
+%kernel_variant_preun -v 64k-debug -e
 %kernel_variant_post -v 64k-debug
 %endif
 
 %if %{with_arm64_64k} && %{with_debug} && %{with_efiuki}
 %kernel_variant_posttrans -v 64k-debug -u virt
-%kernel_variant_preun -v 64k-debug -u virt
+%kernel_variant_preun -v 64k-debug -u virt -e
 %endif
 
 %if %{with_arm64_64k_base} && %{with_efiuki}
 %kernel_variant_posttrans -v 64k -u virt
-%kernel_variant_preun -v 64k -u virt
+%kernel_variant_preun -v 64k -u virt -e
 %endif
 
 %if %{with_realtime_base}
@@ -4368,9 +4375,14 @@ fi\
 #
 #
 %changelog
-* Mon Aug 04 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.d2eedaa3909b.10]
+* Tue Aug 05 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.7e161a991ea7.11]
 - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver)
 
+* Tue Aug 05 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.7e161a991ea7.10]
+- rename CONFIG_PAGE_BLOCK_ORDER to CONFIG_PAGE_BLOCK_MAX_ORDER (Justin M. Forbes)
+- kernel.spec: add '-e' option to %%preun for kernel-core and kernel-uki-virt (Xuemin Li)
+- Linux v6.17.0-0.rc0.7e161a991ea7
+
 * Mon Aug 04 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.17.0-0.rc0.d2eedaa3909b.9]
 - Remove CONFIG_TEST_MISC_MINOR as deps are no longer met (Justin M. Forbes)
 - Linux v6.17.0-0.rc0.d2eedaa3909b
diff --git a/patch-6.17-redhat.patch b/patch-6.17-redhat.patch
index f98888a06..3cef7e420 100644
--- a/patch-6.17-redhat.patch
+++ b/patch-6.17-redhat.patch
@@ -80,10 +80,10 @@
  79 files changed, 2721 insertions(+), 239 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index c1a5cd991f2e..f1cf37b1d002 100644
+index 747a55abf494..75f583e28d1d 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -6379,6 +6379,17 @@
+@@ -6389,6 +6389,17 @@
  		2	The "airplane mode" button toggles between everything
  			blocked and everything unblocked.
  
@@ -101,7 +101,7 @@ index c1a5cd991f2e..f1cf37b1d002 100644
  	ring3mwait=disable
  			[KNL] Disable ring 3 MONITOR/MWAIT feature on supported
  			CPUs.
-@@ -7745,6 +7756,15 @@
+@@ -7759,6 +7770,15 @@
  	unknown_nmi_panic
  			[X86] Cause panic on unknown NMI.
  
diff --git a/sources b/sources
index a34eddea8..ff4bbfa65 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.16-11489-gd2eedaa3909b.tar.xz) = d990825f03910845caf1ebb3badc4ba7b104c2ed1902ef51388aed25300da29153a4a5bbf268cb78a33e1e9f06b96e778d70ba42b88f81acbcc1fb71a4676b48
-SHA512 (kernel-abi-stablelists-6.17.0.tar.xz) = d7faf0d203724c400bcf06e4f9d8677cd49364fd89f7252fd4a0b159f55a1a58ec41db9df6d99f89e4162ad9f23437a251975eb6879dd1713aae3c122aac9260
-SHA512 (kernel-kabi-dw-6.17.0.tar.xz) = 35914e6a8fa70ede23cf6e8c51fb2281c1e124e7464afd6affc9dcff48584468f3a2870fb4d69cf89d97dc04393cc4811e9acf937898a709f54b74b4dcd0c4d4
+SHA512 (linux-6.16-11699-g7e161a991ea7.tar.xz) = abadfe74e36faef3fcd71974f699d243dba89f6992cfcdf1c12a246855ecec9bef0df34ae7a432726ae426f53b1e41d3e40fdfed71c86276124c3acce8ec126b
+SHA512 (kernel-abi-stablelists-6.17.0.tar.xz) = fb77168706d26ea769a88a7d43cabfc1a31661b1f92cf7e473c9be72d7f4b4c37d90f68fa1032171770e5a849c03b3b748370db78be500ff3f52ce79410389b1
+SHA512 (kernel-kabi-dw-6.17.0.tar.xz) = 5b0978137c57e3c1bfcbd1079c5cd1223c0c321248faedc46d03bc7f2cfc3ffa64dc47ee456b10f3b0b33dbe3457bec8f26eb5eecefff13db35a001ba7cc3808