diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4a5a639..5b7a2dd 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 = 6
+RHEL_RELEASE = 7
 
 #
 # Early y+1 numbering
@@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes")
   endif
 endif
 
-RTBUILD:=.6
+RTBUILD:=.7
diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config
index 150fb56..88f3604 100644
--- a/kernel-rt-x86_64-debug-rhel.config
+++ b/kernel-rt-x86_64-debug-rhel.config
@@ -6727,6 +6727,7 @@ CONFIG_UWB_WHCI=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
+# CONFIG_VBOXGUEST is not set
 # CONFIG_VBOXSF_FS is not set
 # CONFIG_VCNL3020 is not set
 # CONFIG_VCNL4000 is not set
@@ -6949,7 +6950,7 @@ CONFIG_VIDEO_V4L2=m
 # CONFIG_VIPERBOARD_ADC is not set
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config
index 1217e18..134a941 100644
--- a/kernel-rt-x86_64-rhel.config
+++ b/kernel-rt-x86_64-rhel.config
@@ -6705,6 +6705,7 @@ CONFIG_UWB_WHCI=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
+# CONFIG_VBOXGUEST is not set
 # CONFIG_VBOXSF_FS is not set
 # CONFIG_VCNL3020 is not set
 # CONFIG_VCNL4000 is not set
@@ -6927,7 +6928,7 @@ CONFIG_VIDEO_V4L2=m
 # CONFIG_VIPERBOARD_ADC is not set
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
diff --git a/kernel.spec b/kernel.spec
index 9b3e777..b5181b9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 6
+%global distro_build 7
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 6.rt21.6.el9
+%define pkgrelease 7.rt21.7.el9
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 6.rt21.6%{?buildid}%{?dist}
+%define specrelease 7.rt21.7%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -699,7 +699,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.0-6.rt21.6.el9.tar.xz
+Source0: linux-5.14.0-7.rt21.7.el9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1421,8 +1421,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.0-6.rt21.6.el9 -c
-mv linux-5.14.0-6.rt21.6.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-7.rt21.7.el9 -c
+mv linux-5.14.0-7.rt21.7.el9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2325,7 +2325,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
 pushd tools/testing/selftests
 # We need to install here because we need to call make with ARCH set which
 # doesn't seem possible to do in the install section.
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
 
 # 'make install' for bpf is broken and upstream refuses to fix it.
 # Install the needed files manually.
@@ -3071,6 +3071,20 @@ fi
 #
 #
 %changelog
+* 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]
+- redhat/.gitignore: Add rhel9 KABI files (Prarit Bhargava) [2009489]
+- hwmon: (k10temp) Add support for yellow carp (David Arcari) [1987069]
+- hwmon: (k10temp) Rework the temperature offset calculation (David Arcari) [1987069]
+- hwmon: (k10temp) Don't show Tdie for all Zen/Zen2/Zen3 CPU/APU (David Arcari) [1987069]
+- hwmon: (k10temp) Add additional missing Zen2 and Zen3 APUs (David Arcari) [1987069]
+- hwmon: (k10temp) support Zen3 APUs (David Arcari) [1987069]
+- selinux,smack: fix subjective/objective credential use mixups (Ondrej Mosnacek) [2008145]
+- redhat: kernel.spec: selftests: abort on build failure (Jiri Benc) [2004012]
+- Revert "bpf, selftests: Disable tests that need clang13" (Jiri Benc) [2004012]
+- selftests, bpf: Fix makefile dependencies on libbpf (Jiri Benc) [2004012]
+
 * Mon Oct 11 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-6.rt21.6.el9]
 - pinctrl: Bulk conversion to generic_handle_domain_irq() (David Arcari) [2000232]
 - pinctrl: amd: Handle wake-up interrupt (David Arcari) [2000232]
diff --git a/sources b/sources
index 5b33225..8261c20 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-6.rt21.6.el9.tar.xz) = bc6ff915415b2c57d2470ef5271909d03a9e9a3ed3a8895edce47c6df21d4e58e2f3bed8885fa7160216e449cb260ff80fe91f8d2550c8fa2b596a5cf60dfaa8
-SHA512 (kernel-abi-stablelists-5.14.0-6.tar.bz2) = f88c39eb0ac5d2a202046dba1e7037d51a363e12385a718476e66fd55cfc78f8e8525ee44b9fc793480b64b376f2a2283c12a6cf0ee1325038acb438fe433752
-SHA512 (kernel-kabi-dw-5.14.0-6.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914
+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