diff --git a/filter-armv7hl.sh.fedora b/filter-armv7hl.sh.fedora
index 699b4c7c6..3602743b1 100644
--- a/filter-armv7hl.sh.fedora
+++ b/filter-armv7hl.sh.fedora
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco d
 
 drmdrvs="amd arm armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm nouveau omapdrm panel pl111 radeon rockchip sti stm sun4i sun4i-drm-hdmi tegra tilcdc tinydrm vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls bq27xxx_battery_hdqi mlx5_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls bq27xxx_battery_hdq mlx5_vdpa"
diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora
index 070149115..2c3444bca 100644
--- a/filter-ppc64le.sh.fedora
+++ b/filter-ppc64le.sh.fedora
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls rnbd-client rnbd-server mlx5_vdpa"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls rnbd-client rnbd-server"
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a94e890a5..2fc35ef89 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3409,7 +3409,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3430,7 +3430,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index e4dac735a..e30b7c8c3 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3392,7 +3392,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3413,7 +3413,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index d5e54f4f5..b161c8290 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 46deaf57d..2b2f1f7f8 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -273,6 +273,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 2dc79f338..bf13f9410 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -217,6 +217,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 8a76973c4..77d4ce0da 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -192,6 +192,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3277,7 +3278,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3298,7 +3299,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a43e4e8f2..7c8f53842 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -216,6 +216,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index d73f6f966..b601530f9 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -192,6 +192,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3261,7 +3262,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3282,7 +3283,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 65d8dd882..74eb093c2 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -221,6 +221,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index ade3a9435..5fa924aba 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -192,6 +192,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3248,7 +3249,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3269,7 +3270,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 8fbcbd04a..67b85c8ff 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -220,6 +220,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 229c110fb..37f4ae8ca 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -192,6 +192,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3232,7 +3233,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3253,7 +3254,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ea3730ae9..ad8659f55 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -192,6 +192,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3254,7 +3255,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3275,7 +3276,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 23dec43a5..241aed17e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -276,6 +276,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 03f7325c5..7427767bb 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -224,6 +224,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3453,7 +3454,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3474,7 +3475,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 65836f541..23177515c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -275,6 +275,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 76a8b53f7..cc81c104e 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -224,6 +224,7 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
@@ -3436,7 +3437,7 @@ CONFIG_NET_SCH_DEFAULT=y
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCHED=y
-# CONFIG_NET_SCH_ETF is not set
+CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_ETS=m
 CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
@@ -3457,7 +3458,7 @@ CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 # CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_TAPRIO is not set
+CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SWITCHDEV=y
diff --git a/kernel.spec b/kernel.spec
index 213e9816d..e24c94099 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc1.20200818git06a4ec1d9dc6.1
+%global distro_build 0.rc1.20200820git18445bf405cb.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.9.0
-%define pkgrelease 0.rc1.20200818git06a4ec1d9dc6.1
+%define pkgrelease 0.rc1.20200820git18445bf405cb.1
 
 # This is needed to do merge window version magic
 %define patchlevel 9
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20200818git06a4ec1d9dc6.1%{?buildid}%{?dist}
+%define specrelease 0.rc1.20200820git18445bf405cb.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -485,7 +485,7 @@ BuildRequires: python3-devel
 BuildRequires: rsync
 %endif
 %if %{with_doc}
-BuildRequires: xmlto, asciidoc, python3-sphinx
+BuildRequires: xmlto, asciidoc, python3-sphinx, python3-sphinx_rtd_theme
 %endif
 %if %{with_sparse}
 BuildRequires: sparse
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200818git06a4ec1d9dc6.tar.xz
+Source0: linux-20200820git18445bf405cb.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1283,8 +1283,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200818git06a4ec1d9dc6 -c
-mv linux-20200818git06a4ec1d9dc6 linux-%{KVERREL}
+%setup -q -n kernel-20200820git18445bf405cb -c
+mv linux-20200820git18445bf405cb linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2745,12 +2745,7 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
-%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca*.cer\
-%ifarch s390x ppc64le\
-%if 0%{!?4:1}\
-%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \
-%endif\
-%endif\
+%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
 %if %{1}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
 %endif\
@@ -2796,9 +2791,16 @@ fi
 #
 #
 %changelog
-* Tue Aug 18 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.9.0-0.rc1.20200818git06a4ec1d9dc6.1]
+* Wed Aug 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200819git18445bf405cb.1]
+- 18445bf405cb rebase
+- Add mlx5_vdpa to module filter for Fedora ("Justin M. Forbes")
+- Add python3-sphinx_rtd_theme buildreq for docs ("Justin M. Forbes")
+- kernel.spec: Remove kernel-keys directory on rpm erase (Prarit Bhargava)
+- More Fedora config updates ("Justin M. Forbes")
 - New config deps ("Justin M. Forbes")
-- Fedora config updates ("Justin M. Forbes")
+- Updated changelog for the release based on 06a4ec1d9dc6 (Fedora Kernel Team)
+- redhat: ark: enable CONFIG_NET_SCH_TAPRIO (Davide Caratti)
+- redhat: ark: enable CONFIG_NET_SCH_ETF (Davide Caratti)
 
 * Tue Aug 18 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200818git06a4ec1d9dc6.1]
 - 06a4ec1d9dc6 rebase
diff --git a/sources b/sources
index 50c9d94ee..45ce0e2a0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200818git06a4ec1d9dc6.tar.xz) = 25fb96d639895a3f7b66be49b9a309e7e512f064b0539313297478afdbb90b7e49bd06ccd029d9eeef41a9e46f2317ecf89339a97d4b6fa4df3b1b0247d214ed
-SHA512 (kernel-abi-whitelists-5.9.0-0.rc1.20200818git06a4ec1d9dc6.1.tar.bz2) = 6201f31c41eea83ceff42cbcbee92e2feb50ba57311e5a082d4601f1be4ad5e5c3b76ec077379ec88f9e12e3e10d8d503bc659bc3275bce9474ed2b28aaacb5a
-SHA512 (kernel-kabi-dw-5.9.0-0.rc1.20200818git06a4ec1d9dc6.1.tar.bz2) = 3539aa6f385c20de9f2de52b8346940a0c934e675964a22ad86149a508dcab60b29c183a187f298bdc3ed914c2320c3f9caa019d448560388d8554b49a92729c
+SHA512 (linux-20200820git18445bf405cb.tar.xz) = d0d84ccb487f56bcaa276e48d23594db3f13b13a3c0ed289c86d1bf93a3fdb6e9717af8c51846c0d6a3ae69831634f73e19f57715429a68053639906921017d1
+SHA512 (kernel-abi-whitelists-5.9.0-0.rc1.20200820git18445bf405cb.1.tar.bz2) = 14316c290db003edd53c5c2eec34f94fac50c4a920571b77fc0bee9e62eac86f9f25cea310dbdb6f765ce72eb37b4f32c4d6fe49bf5a171240dec31721d4a8c1
+SHA512 (kernel-kabi-dw-5.9.0-0.rc1.20200820git18445bf405cb.1.tar.bz2) = 854ecccec0537f59daa008cbbc18127b6deb66ee1597b5d52d97a5746a96644559b579dc30f1699f76f93452d2566b271dc5ef6c95e6baf7277e427239faf4c6