diff --git a/Makefile.rhelver b/Makefile.rhelver
index a435426..96c66bf 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 = 30
+RHEL_RELEASE = 31
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index b66b89e..09eeab1 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1424,7 +1424,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DRM_XEN is not set
 # CONFIG_DS1682 is not set
@@ -2341,6 +2341,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -6836,7 +6837,7 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VMXNET3 is not set
+CONFIG_VMXNET3=m
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3adcbc9..2ab44a9 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1160,7 +1160,7 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1416,7 +1416,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_XEN_FRONTEND is not set
 # CONFIG_DRM_XEN is not set
 # CONFIG_DS1682 is not set
@@ -2325,6 +2325,7 @@ CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USNIC=m
+# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFTL is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
@@ -6813,7 +6814,7 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMAP_STACK=y
 # CONFIG_VME_BUS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VMXNET3 is not set
+CONFIG_VMXNET3=m
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 0facb25..e5aa4eb 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1007,7 +1007,7 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 69db5fe..11bef82 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1013,7 +1013,7 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 68d358d..3a4a027 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1019,7 +1019,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index bdfb24a..ca0555f 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1073,7 +1073,7 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
diff --git a/kernel.spec b/kernel.spec
index bb305ca..92d41d1 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 30
+%global distro_build 31
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -129,13 +129,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 30.el9
+%define pkgrelease 31.el9
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 30%{?buildid}%{?dist}
+%define specrelease 31%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -572,6 +572,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel
 BuildRequires: dwarves
 BuildRequires: python3-devel
 BuildRequires: gcc-plugin-devel
+BuildRequires: kernel-rpm-macros >= 185-9
 %ifnarch %{nobuildarches} noarch
 BuildRequires: bpftool
 %endif
@@ -676,7 +677,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.0-30.el9.tar.xz
+Source0: linux-5.14.0-31.el9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1361,8 +1362,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.0-30.el9 -c
-mv linux-5.14.0-30.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-31.el9 -c
+mv linux-5.14.0-31.el9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2951,6 +2952,31 @@ fi
 #
 #
 %changelog
+* Tue Dec 14 2021 Herton R. Krzesinski <herton@redhat.com> [5.14.0-31.el9]
+- Disable CONFIG_DEBUG_PREEMPT to restore performance (Phil Auld) [2030877]
+- tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos (Paolo Abeni) [2028279]
+- tcp: fix tp->undo_retrans accounting in tcp_sacktag_one() (Paolo Abeni) [2028279]
+- tcp: md5: Fix overlap between vrf and non-vrf keys (Paolo Abeni) [2028279]
+- tcp: don't free a FIN sk_buff in tcp_remove_empty_skb() (Paolo Abeni) [2028279]
+- tcp: Fix uninitialized access in skb frags array for Rx 0cp. (Paolo Abeni) [2028279]
+- tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows (Paolo Abeni) [2028279]
+- Revert "ibmvnic: check failover_pending in login response" (Steve Best) [2010612]
+- ibmvnic: check failover_pending in login response (Steve Best) [2010612]
+- ibmvnic: check failover_pending in login response (Steve Best) [2010612]
+- kernfs: don't create a negative dentry if inactive node exists (Ian Kent) [2004858]
+- kernfs: also call kernfs_set_rev() for positive dentry (Ian Kent) [2004858]
+- kernfs: dont call d_splice_alias() under kernfs node lock (Ian Kent) [2004858]
+- kernfs: use i_lock to protect concurrent inode updates (Ian Kent) [2004858]
+- kernfs: switch kernfs to use an rwsem (Ian Kent) [2004858]
+- kernfs: use VFS negative dentry caching (Ian Kent) [2004858]
+- kernfs: add a revision to identify directory node changes (Ian Kent) [2004858]
+- drm/hyperv: Fix double mouse pointers (Vitaly Kuznetsov) [1999697]
+- Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout" (Frantisek Sumsal) [2020918]
+- watchdog: iTCO_wdt: Fix detection of SMI-off case (Frantisek Sumsal) [2020918]
+- redhat/kernel.spec.template: enable dependencies generation (Eugene Syromiatnikov) [1975927]
+- redhat: configs: Update configs for vmware (Kamal Heib) [1991676 2009344]
+- redhat/configs: Enable CONFIG_DRM_VMWGFX on aarch64 (Michel Dänzer) [1992253]
+
 * Mon Dec 13 2021 Herton R. Krzesinski <herton@redhat.com> [5.14.0-30.el9]
 - selftests: KVM: avoid failures due to reserved HyperTransport region (Vitaly Kuznetsov) [2009338]
 - KVM: X86: Fix when shadow_root_level=5 && guest root_level<4 (Vitaly Kuznetsov) [2009338]
diff --git a/sources b/sources
index ca57002..a56593d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-30.el9.tar.xz) = 35f50fb4a7d44dd97aa756a14f52278a612d0c97acbca20b00759b13a7651274cb06f7b018178a24f849fe1359b4894cd9c48cefb797a7b1ec8e1fdc5ed3d3f7
-SHA512 (kernel-abi-stablelists-5.14.0-30.tar.bz2) = f59659eb4a355dd941e728c77bd59397d8fffcefef109d8bba787c702788f7d57b65474cac2f92b76c7df04373de31060407f65a346ac3550aa1c5d57d0c295f
-SHA512 (kernel-kabi-dw-5.14.0-30.tar.bz2) = 3f43a3d882763b9707e62600604f43259397edd98f838d015570292382fa142cef1e3c23ef8a1efac5a0ceab2f0403a72c848ba6c346ea146509660dc72a2383
+SHA512 (linux-5.14.0-31.el9.tar.xz) = 7a1edd9154b8f498c63fbd722771aa656f4181e23c3d8a355d0b522f7f320cba91b8918ef3bb6e397fb36b6f458a4d42c701947ecc5c68aa6d3ef420305f3999
+SHA512 (kernel-abi-stablelists-5.14.0-31.tar.bz2) = a35335b5cd0ed81757ac1a818f484900367ac4f77d9a17f6b9a070342788b811c74c3c4341c384d45f2a28d26220de7dcfbc74c6ceb66af0902e5a32d15efb4d
+SHA512 (kernel-kabi-dw-5.14.0-31.tar.bz2) = 47dad234de655775e813bd667692a3a0773c53c3ad1adf878c39171382b65ca986a867f62af211ace6248eaa3e2d1201e7d987723d3d82f0487dd31efa17f10e