diff --git a/Makefile.rhelver b/Makefile.rhelver
index 5b7a2dd..64ec17f 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 7
+RHEL_RELEASE = 8
 
 #
 # Early y+1 numbering
@@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes")
   endif
 endif
 
-RTBUILD:=.7
+RTBUILD:=.8
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
deleted file mode 100644
index 6a5065c..0000000
--- a/filter-aarch64.sh.fedora
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/bash
-
-# This is the aarch64 override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio w1"
-
-ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell micrel myricom neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
-
-drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq"
diff --git a/filter-armv7hl.sh.fedora b/filter-armv7hl.sh.fedora
deleted file mode 100644
index 1231ab0..0000000
--- a/filter-armv7hl.sh.fedora
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/bash
-
-# This is the armv7hl override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband media memstick message nfc ntb pcmcia ssb soundwire staging tty uio w1"
-
-ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex mellanox micrel myricom natsemi neterion nvidia packetengines qlogic rdc sfc silan sis sun tehuti via wiznet xircom"
-
-drmdrvs="amd arm armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm nouveau omapdrm panel pl111 radeon rockchip sti stm sun4i tegra tilcdc tiny vc4"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr bq27xxx_battery_hdq mlx5_vdpa dfl-emif spi-altera-dfl"
diff --git a/filter-i686.sh.fedora b/filter-i686.sh.fedora
deleted file mode 100644
index 3ab2f63..0000000
--- a/filter-i686.sh.fedora
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# This is the i686 override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio w1"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit chcr parport_serial regmap-sdw hid-asus"
diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora
deleted file mode 100755
index 678825b..0000000
--- a/filter-modules.sh.fedora
+++ /dev/null
@@ -1,177 +0,0 @@
-#! /bin/bash
-#
-# Called as filter-modules.sh list-of-modules Arch
-
-# This script filters the modules into the kernel-core and kernel-modules
-# subpackages.  We list out subsystems/subdirs to prune from the installed
-# module directory.  What is left is put into the kernel-core package.  What is
-# pruned is contained in the kernel-modules package.
-#
-# This file contains the default subsys/subdirs to prune from all architectures.
-# If an architecture needs to differ, we source a per-arch filter-<arch>.sh file
-# that contains the set of override lists to be used instead.  If a module or
-# subsys should be in kernel-modules on all arches, please change the defaults
-# listed here.
-
-# Overrides is individual modules which need to remain in kernel-core due to deps.
-overrides="cec"
-
-# Set the default dirs/modules to filter out
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio w1"
-
-chardrvs="mwave pcmcia"
-
-netdrvs="appletalk can dsa hamradio ieee802154 ppp slip usb wireless"
-
-ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell mellanox neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"
-
-inputdrvs="gameport tablet touchscreen"
-
-hiddrvs="surface-hid"
-
-scsidrvs="aacraid aic7xxx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic isci libsas lpfc megaraid mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
-
-usbdrvs="atm image misc serial"
-
-fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
-
-netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
-
-drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit  chcr parport_serial regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus iTCO_wdt rnbd-client rnbd-server mlx5_vdpa spi-altera-dfl"
-
-# Grab the arch-specific filter list overrides
-source ./filter-$2.sh
-
-filter_dir() {
-	filelist=$1
-	dir=$2
-
-	grep -v -e "${dir}/" ${filelist} > ${filelist}.tmp
-
-	if [ $? -ne 0 ]
-	then
-		echo "Couldn't remove ${dir}.  Skipping."
-	else
-		grep -e "${dir}/" ${filelist} >> k-d.list
-		mv ${filelist}.tmp $filelist
-	fi
-	
-	return 0
-}
-
-filter_ko() {
-	filelist=$1
-	mod=$2
-
-	grep -v -e "${mod}.ko" ${filelist} > ${filelist}.tmp
-
-	if [ $? -ne 0 ]
-	then
-		echo "Couldn't remove ${mod}.ko  Skipping."
-	else
-		grep -e "${mod}.ko" ${filelist} >> k-d.list
-		mv ${filelist}.tmp $filelist
-	fi
-	
-	return 0
-}
-
-# Filter the drivers/ subsystems
-for subsys in ${driverdirs}
-do
-	filter_dir $1 drivers/${subsys}
-done
-
-# Filter the networking drivers
-for netdrv in ${netdrvs}
-do
-	filter_dir $1 drivers/net/${netdrv}
-done
-
-# Filter the char drivers
-for char in ${chardrvs}
-do
-	filter_dir $1 drivers/char/${char}
-done
-
-# Filter the ethernet drivers
-for eth in ${ethdrvs}
-do
-	filter_dir $1 drivers/net/ethernet/${eth}
-done
-
-# SCSI
-for scsi in ${scsidrvs}
-do
-	filter_dir $1 drivers/scsi/${scsi}
-done
-
-# Input
-for input in ${inputdrvs}
-do
-	filter_dir $1 drivers/input/${input}
-done
-
-# hid
-for hid in ${hiddrvs}
-do
-	filter_dir $1 drivers/hid/${hid}
-done
-
-# USB
-for usb in ${usbdrvs}
-do
-	filter_dir $1 drivers/usb/${usb}
-done
-
-# Filesystems
-for fs in ${fsdrvs}
-do
-	filter_dir $1 fs/${fs}
-done
-
-# Network protocols
-for prot in ${netprots}
-do
-	filter_dir $1 kernel/net/${prot}
-done
-
-# DRM
-for drm in ${drmdrvs}
-do
-	filter_dir $1 drivers/gpu/drm/${drm}
-done
-
-# Just kill sound.
-filter_dir $1 kernel/sound
-filter_dir $1 kernel/drivers/soundwire
-
-# Now go through and filter any single .ko files that might have deps on the
-# things we filtered above
-for mod in ${singlemods}
-do
-        filter_ko $1 ${mod}
-done
-
-# Now process the override list to bring those modules back into core
-for mod in ${overrides}
-do
-	grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp
-	if [ $? -ne 0 ]
-        then
-                echo "Couldn't save ${mod}.ko  Skipping."
-        else
-                grep -e "/${mod}.ko" k-d.list >> $filelist
-                mv k-d.list.tmp k-d.list
-        fi
-
-done
-
-# Go through our generated drivers list and remove the .ko files.  We'll
-# restore them later.
-for mod in `cat k-d.list`
-do
-	rm -rf $mod
-done
diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora
deleted file mode 100644
index 972298e..0000000
--- a/filter-ppc64le.sh.fedora
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# This is the ppc64le override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa"
diff --git a/filter-s390x.sh.fedora b/filter-s390x.sh.fedora
deleted file mode 100644
index 04f7110..0000000
--- a/filter-s390x.sh.fedora
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-# This is the s390x override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-# Defaults work so no need to override
diff --git a/filter-x86_64.sh.fedora b/filter-x86_64.sh.fedora
deleted file mode 100644
index 1aa80f2..0000000
--- a/filter-x86_64.sh.fedora
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-# This is the x86_64 override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-# Defaults work so no need to override
diff --git a/kernel.spec b/kernel.spec
index b5181b9..34d16e3 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -3,6 +3,11 @@
 # environment changes that affect %%install need to go
 # here before the %%install macro is pre-built.
 
+# Include Fedora files
+%global include_fedora 0
+# Include RHEL files
+%global include_rhel 1
+
 # Disable LTO in userspace packages.
 %global _lto_cflags %{nil}
 
@@ -80,7 +85,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 7
+%global distro_build 8
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -124,13 +129,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 7.rt21.7.el9
+%define pkgrelease 8.rt21.8.el9
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 7.rt21.7%{?buildid}%{?dist}
+%define specrelease 8.rt21.8%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -699,7 +704,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.0-7.rt21.7.el9.tar.xz
+Source0: linux-5.14.0-8.rt21.8.el9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -712,9 +717,6 @@ Source1: Makefile.rhelver
 %define signing_key_filename kernel-signing-s390.cer
 %endif
 
-Source8: x509.genkey.rhel
-Source9: x509.genkey.fedora
-
 %if %{?released_kernel}
 
 Source10: redhatsecurebootca5.cer
@@ -753,67 +755,75 @@ Source11: redhatsecureboot401.cer
 # released_kernel
 %endif
 
-Source22: mod-extra.list.rhel
-Source16: mod-extra.list.fedora
-Source17: mod-denylist.sh
-Source18: mod-sign.sh
-Source79: parallel_xz.sh
+Source20: mod-denylist.sh
+Source21: mod-sign.sh
+Source22: parallel_xz.sh
 
-Source80: filter-x86_64.sh.fedora
-Source81: filter-armv7hl.sh.fedora
-Source82: filter-i686.sh.fedora
-Source83: filter-aarch64.sh.fedora
-Source86: filter-ppc64le.sh.fedora
-Source87: filter-s390x.sh.fedora
-Source89: filter-modules.sh.fedora
+%define modsign_cmd %{SOURCE21}
 
-Source90: filter-x86_64.sh.rhel
-Source91: filter-armv7hl.sh.rhel
-Source92: filter-i686.sh.rhel
-Source93: filter-aarch64.sh.rhel
-Source96: filter-ppc64le.sh.rhel
-Source97: filter-s390x.sh.rhel
-Source99: filter-modules.sh.rhel
-%define modsign_cmd %{SOURCE18}
+%if 0%{?include_rhel}
+Source23: x509.genkey.rhel
+
+Source26: mod-extra.list.rhel
 
 %if !%{with_realtime}
-Source20: %{name}-aarch64-rhel.config
-Source21: %{name}-aarch64-debug-rhel.config
-Source30: %{name}-ppc64le-rhel.config
-Source31: %{name}-ppc64le-debug-rhel.config
-Source32: %{name}-s390x-rhel.config
-Source33: %{name}-s390x-debug-rhel.config
-Source34: %{name}-s390x-zfcpdump-rhel.config
+Source24: kernel-rt-aarch64-rhel.config
+Source25: kernel-rt-aarch64-debug-rhel.config
+Source27: kernel-rt-ppc64le-rhel.config
+Source28: kernel-rt-ppc64le-debug-rhel.config
+Source29: kernel-rt-s390x-rhel.config
+Source30: kernel-rt-s390x-debug-rhel.config
+Source31: kernel-rt-s390x-zfcpdump-rhel.config
 %endif
-Source35: %{name}-x86_64-rhel.config
-Source36: %{name}-x86_64-debug-rhel.config
+Source32: kernel-rt-x86_64-rhel.config
+Source33: kernel-rt-x86_64-debug-rhel.config
+
+Source34: filter-x86_64.sh.rhel
+Source35: filter-armv7hl.sh.rhel
+Source36: filter-i686.sh.rhel
+Source37: filter-aarch64.sh.rhel
+Source38: filter-ppc64le.sh.rhel
+Source39: filter-s390x.sh.rhel
+Source40: filter-modules.sh.rhel
+%endif
+
+%if 0%{?include_fedora}
+Source50: x509.genkey.fedora
+Source51: mod-extra.list.fedora
 
 %if !%{with_realtime}
-Source37: %{name}-aarch64-fedora.config
-Source38: %{name}-aarch64-debug-fedora.config
-Source39: %{name}-armv7hl-fedora.config
-Source40: %{name}-armv7hl-debug-fedora.config
-Source41: %{name}-armv7hl-lpae-fedora.config
-Source42: %{name}-armv7hl-lpae-debug-fedora.config
-Source43: %{name}-i686-fedora.config
-Source44: %{name}-i686-debug-fedora.config
-Source45: %{name}-ppc64le-fedora.config
-Source46: %{name}-ppc64le-debug-fedora.config
-Source47: %{name}-s390x-fedora.config
-Source48: %{name}-s390x-debug-fedora.config
-Source49: %{name}-x86_64-fedora.config
-Source50: %{name}-x86_64-debug-fedora.config
+Source52: kernel-rt-aarch64-fedora.config
+Source53: kernel-rt-aarch64-debug-fedora.config
+Source54: kernel-rt-armv7hl-fedora.config
+Source55: kernel-rt-armv7hl-debug-fedora.config
+Source56: kernel-rt-armv7hl-lpae-fedora.config
+Source57: kernel-rt-armv7hl-lpae-debug-fedora.config
+Source58: kernel-rt-i686-fedora.config
+Source59: kernel-rt-i686-debug-fedora.config
+Source60: kernel-rt-ppc64le-fedora.config
+Source61: kernel-rt-ppc64le-debug-fedora.config
+Source62: kernel-rt-s390x-fedora.config
+Source63: kernel-rt-s390x-debug-fedora.config
+Source64: kernel-rt-x86_64-fedora.config
+Source65: kernel-rt-x86_64-debug-fedora.config
 %endif
 
+Source67: filter-x86_64.sh.fedora
+Source68: filter-armv7hl.sh.fedora
+Source69: filter-i686.sh.fedora
+Source70: filter-aarch64.sh.fedora
+Source71: filter-ppc64le.sh.fedora
+Source72: filter-s390x.sh.fedora
+Source73: filter-modules.sh.fedora
+%endif
 
+Source80: generate_all_configs.sh
+Source81: process_configs.sh
 
-Source51: generate_all_configs.sh
+Source82: update_scripts.sh
+Source83: generate_crashkernel_default.sh
 
-Source52: process_configs.sh
-Source56: update_scripts.sh
-Source57: generate_crashkernel_default.sh
-
-Source54: mod-internal.list
+Source84: mod-internal.list
 
 Source100: rheldup3.x509
 Source101: rhelkpatch1.x509
@@ -1421,8 +1431,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.0-7.rt21.7.el9 -c
-mv linux-5.14.0-7.rt21.7.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-8.rt21.8.el9 -c
+mv linux-5.14.0-8.rt21.8.el9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -1481,7 +1491,7 @@ cd configs
 
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/kernel-*.config .
-cp %{SOURCE51} .
+cp %{SOURCE80} .
 # merge.pl
 cp %{SOURCE3000} .
 # kernel-local
@@ -1529,7 +1539,7 @@ done
 %endif
 %endif
 
-cp %{SOURCE52} .
+cp %{SOURCE81} .
 OPTS=""
 %if %{with_configchecks}
 	OPTS="$OPTS -w -n -c"
@@ -1541,7 +1551,7 @@ done
 %endif
 ./process_configs.sh $OPTS %{name} %{rpmversion}
 
-cp %{SOURCE56} .
+cp %{SOURCE82} .
 RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
 
 # end of kernel config
@@ -2064,12 +2074,12 @@ BuildKernel() {
     remove_depmod_files
 
     # Identify modules in the kernel-modules-extras package
-    %{SOURCE17} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
+    %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list
     # Identify modules in the kernel-modules-extras package
-    %{SOURCE17} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE54} internal
+    %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal
 %if %{with_realtime}
     # Identify modules in the kernel-rt-kvm package
-    %{SOURCE17} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE400} kvm
+    %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE400} kvm
 %endif
 
     #
@@ -2181,7 +2191,7 @@ BuildKernel() {
     find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete
 
     # Generate crashkernel default config
-    %{SOURCE57} "$KernelVer" "$Arch" "$RPM_BUILD_ROOT"
+    %{SOURCE83} "$KernelVer" "$Arch" "$RPM_BUILD_ROOT"
 
     # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel
     mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
@@ -3071,6 +3081,29 @@ fi
 #
 #
 %changelog
+* Mon Oct 18 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-8.rt21.8.el9]
+- selftests/powerpc: Add scv versions of the basic TM syscall tests (Desnes A. Nunes do Rosario) [1986651]
+- powerpc/64s: system call scv tabort fix for corrupt irq soft-mask state (Desnes A. Nunes do Rosario) [1986651]
+- mm/swap: consider max pages in iomap_swapfile_add_extent (Carlos Maiolino) [2005191]
+- platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake PCH (David Arcari) [2007707]
+- platform/x86/intel: pmc/core: Add Alder Lake low power mode support for pmc core (David Arcari) [2007707]
+- platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR) support to Alder Lake (David Arcari) [2007707]
+- platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver (David Arcari) [2007707]
+- platform/x86: intel_pmc_core: Move to intel sub-directory (David Arcari) [2007707]
+- platform/x86: intel_pmc_core: Prevent possibile overflow (David Arcari) [2007707]
+- Clean-up CONFIG_X86_PLATFORM_DRIVERS_INTEL (David Arcari) [2007707]
+- KVM: nVMX: Filter out all unsupported controls when eVMCS was activated (Vitaly Kuznetsov) [2001912]
+- ipc: remove memcg accounting for sops objects in do_semtimedop() (Rafael Aquini) [1999707] {CVE-2021-3759}
+- memcg: enable accounting of ipc resources (Rafael Aquini) [1999707] {CVE-2021-3759}
+- redhat: BUILDID parameter must come last in genspec.sh (Herton R. Krzesinski)
+- redhat/Makefile.variables: Set INCLUDE_FEDORA_FILES to 0 (Prarit Bhargava) [2009545]
+- redhat: Remove fedora configs directories and files. (Prarit Bhargava) [2009545]
+- redhat/kernel.spec.template: Cleanup source numbering (Prarit Bhargava) [2009545]
+- redhat/kernel.spec.template: Reorganize RHEL and Fedora specific files (Prarit Bhargava) [2009545]
+- redhat/kernel.spec.template: Add include_fedora and include_rhel variables (Prarit Bhargava) [2009545]
+- redhat/Makefile: Make kernel-local global (Prarit Bhargava) [2009545]
+- redhat/Makefile: Use flavors file (Prarit Bhargava) [2009545]
+
 * Tue Oct 12 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-7.rt21.7.el9]
 - locking/lockdep: Set sane defaults for lockdep entries on kernel-rt (Juri Lelli) [1990778]
 - redhat: Enable Nitro Enclaves driver on x86 for real (Vitaly Kuznetsov) [2011739]
diff --git a/mod-extra.list.fedora b/mod-extra.list.fedora
deleted file mode 100644
index c83fc33..0000000
--- a/mod-extra.list.fedora
+++ /dev/null
@@ -1,195 +0,0 @@
-6pack.ko
-a3d.ko
-act200l-sir.ko
-actisys-sir.ko
-adi.ko
-aer_inject.ko
-af_802154.ko
-affs.ko
-ali-ircc.ko
-analog.ko
-appletalk.ko
-atm.ko
-avma1_cs.ko
-avm_cs.ko
-avmfritz.ko
-ax25.ko
-b1.ko
-bas_gigaset.ko
-batman-adv.ko
-baycom_par.ko
-baycom_ser_fdx.ko
-baycom_ser_hdx.ko
-befs.ko
-bpqether.ko
-br2684.ko
-capi.ko
-c_can.ko
-c_can_platform.ko
-clip.ko
-cobra.ko
-coda.ko
-cuse.ko
-db9.ko
-dccp_diag.ko
-dccp_ipv4.ko
-dccp_ipv6.ko
-dccp.ko
-dccp_probe.ko
-diva_idi.ko
-divas.ko
-dlm.ko
-ds1wm.ko
-ds2482.ko
-ds2490.ko
-dss1_divert.ko
-elsa_cs.ko
-ems_pci.ko
-ems_usb.ko
-esd_usb2.ko
-esi-sir.ko
-floppy.ko
-gamecon.ko
-gf2k.ko
-gfs2.ko
-gigaset.ko
-girbil-sir.ko
-grip.ko
-grip_mp.ko
-guillemot.ko
-hdlcdrv.ko
-hfc4s8s_l1.ko
-hfcmulti.ko
-hfcpci.ko
-hisax.ko
-hwa-rc.ko
-hysdn.ko
-i2400m.ko
-i2400m-sdio.ko
-i2400m-usb.ko
-ieee802154.ko
-iforce.ko
-interact.ko
-ipddp.ko
-ipx.ko
-isdn.ko
-joydump.ko
-kingsun-sir.ko
-ks959-sir.ko
-ksdazzle-sir.ko
-kvaser_pci.ko
-l2tp_core.ko
-l2tp_debugfs.ko
-l2tp_eth.ko
-l2tp_ip.ko
-l2tp_netlink.ko
-l2tp_ppp.ko
-lec.ko
-ma600-sir.ko
-magellan.ko
-mcp2120-sir.ko
-mISDN_core.ko
-mISDN_dsp.ko
-mkiss.ko
-mptbase.ko
-mptctl.ko
-mptfc.ko
-nci.ko
-ncpfs.ko
-netjet.ko
-netrom.ko
-nfc.ko
-nilfs2.ko
-ocfs2_dlmfs.ko
-ocfs2_dlm.ko
-ocfs2.ko
-ocfs2_nodemanager.ko
-ocfs2_stackglue.ko
-ocfs2_stack_o2cb.ko
-ocfs2_stack_user.ko
-old_belkin-sir.ko
-orinoco_cs.ko
-orinoco.ko
-orinoco_nortel.ko
-orinoco_pci.ko
-orinoco_plx.ko
-orinoco_usb.ko
-pcspkr.ko
-plx_pci.ko
-pn_pep.ko
-pppoatm.ko
-rds.ko
-rds_rdma.ko
-rds_tcp.ko
-rose.ko
-sch_atm.ko
-sch_cbq.ko
-sch_choke.ko
-sch_drr.ko
-sch_dsmark.ko
-sch_etf.ko
-sch_gred.ko
-sch_mqprio.ko
-sch_multiq.ko
-sch_netem.ko
-sch_qfq.ko
-sch_red.ko
-sch_sfb.ko
-sch_teql.ko
-sctp.ko
-sctp_probe.ko
-sidewinder.ko
-sja1000.ko
-sja1000_platform.ko
-slcan.ko
-slip.ko
-softing_cs.ko
-softing.ko
-spaceball.ko
-spaceorb.ko
-stinger.ko
-sysv.ko
-tcp_bic.ko
-tcp_highspeed.ko
-tcp_htcp.ko
-tcp_hybla.ko
-tcp_illinois.ko
-tcp_lp.ko
-tcp_scalable.ko
-tcp_vegas.ko
-tcp_veno.ko
-tcp_westwood.ko
-tcp_yeah.ko
-tekram-sir.ko
-tmdc.ko
-toim3232-sir.ko
-trancevibrator.ko
-turbografx.ko
-twidjoy.ko
-ubifs.ko
-ufs.ko
-umc.ko
-usbip-core.ko
-usbip-host.ko
-uwb.ko
-vcan.ko
-vhci-hcd.ko
-w1_bq27000.ko
-w1_ds2408.ko
-w1_ds2423.ko
-w1_ds2431.ko
-w1_ds2433.ko
-w1_ds2760.ko
-w1_ds2780.ko
-w1_ds2781.ko
-w1_ds28e04.ko
-w1_smem.ko
-w1_therm.ko
-w6692.ko
-walkera0701.ko
-wanrouter.ko
-warrior.ko
-whci.ko
-wire.ko
-yam.ko
-zhenhua.ko
diff --git a/sources b/sources
index 8261c20..10099a4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c
-SHA512 (linux-5.14.0-7.rt21.7.el9.tar.xz) = 334805bbbe8fad6201e1e9fdc3b9f3204251a92c7213ac0fe11f5176228d332412540a38217735db3f980a34e89e685945d04f52911977664a097c858451e437
-SHA512 (kernel-abi-stablelists-5.14.0-7.tar.bz2) = 678b0091aeb0bbb389b1b3cd1c034313025fc91402a7534cafab1cbdb6fb785faa8423cf12602c39a27fbfc31e0d530679a53bbd3f07d568e7307ec41610c472
-SHA512 (kernel-kabi-dw-5.14.0-7.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914
+SHA512 (linux-5.14.0-8.rt21.8.el9.tar.xz) = fb68aa9585619e373333ac75824d5838a28f112c5e9cd6774fc65a96a902cf3fb3130c4a382323b67daed9a9cb8286bc601430a90d6f0bd2cc679d920e8dbcd4
+SHA512 (kernel-abi-stablelists-5.14.0-8.tar.bz2) = 2f97f291ae80eb6f91b042dd942930509e6f62d50ae50628d2a737d3e29c0e3ad3bceb59f1fad407b643fb2f4c706b3ca2f82dc1f4f74c0f426cd9a010360801
+SHA512 (kernel-kabi-dw-5.14.0-8.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914
diff --git a/x509.genkey.fedora b/x509.genkey.fedora
deleted file mode 100644
index 2f90e1b..0000000
--- a/x509.genkey.fedora
+++ /dev/null
@@ -1,16 +0,0 @@
-[ req ]
-default_bits = 4096
-distinguished_name = req_distinguished_name
-prompt = no
-x509_extensions = myexts
-
-[ req_distinguished_name ]
-O = Fedora
-CN = Fedora kernel signing key
-emailAddress = kernel-team@fedoraproject.org
-
-[ myexts ]
-basicConstraints=critical,CA:FALSE
-keyUsage=digitalSignature
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid