diff --git a/Makefile.rhelver b/Makefile.rhelver
index 907c3d0b8..eb09ed31e 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 2
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 229
+RHEL_RELEASE = 230
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index dd1093e64..a250b4007 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2054,6 +2054,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_HP_ILO=m
+CONFIG_HP_WATCHDOG=m
 # CONFIG_HSA_AMD_P2P is not set
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 5938fd005..b5a32cf5e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2038,6 +2038,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_HP_ILO=m
+CONFIG_HP_WATCHDOG=m
 # CONFIG_HSA_AMD_P2P is not set
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
diff --git a/kernel.spec b/kernel.spec
index 9bb7465d8..7d48d72d9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -119,15 +119,15 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 5.14.0
 %define patchversion 5.14
-%define pkgrelease 229
+%define pkgrelease 230
 %define kversion 5
-%define tarfile_release 5.14.0-229.el9
+%define tarfile_release 5.14.0-230.el9
 # This is needed to do merge window version magic
 %define patchlevel 14
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 229%{?buildid}%{?dist}
+%define specrelease 230%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 5.14.0-229.el9
+%define kabiversion 5.14.0-230.el9
 
 #
 # End of genspec.sh variables
@@ -3110,6 +3110,13 @@ fi
 #
 #
 %changelog
+* Fri Jan 06 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-230.el9]
+- x86/cpu: Add several Intel server CPU model numbers (David Arcari) [2158038]
+- ip_gre: do not report erspan version on GRE interface (Hangbin Liu) [2150168]
+- redhat/configs: enable HP_WATCHDOG for aarch64 (Mark Salter) [2113082]
+- watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. (Mark Salter) [2113082]
+- watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING (Mark Salter) [2113082]
+
 * Thu Jan 05 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-229.el9]
 - scsi: zfcp: Fix double free of FSF request when qdio send fails (Tobias Huschle) [2155158]
 - l2tp: Don't sleep and disable BH under writer-side sk_callback_lock (Guillaume Nault) [2145234] {CVE-2022-4129}
diff --git a/sources b/sources
index 7d9930fb4..5b86bbe41 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-229.el9.tar.xz) = a2c9851222a22019605b83022db91c7c28e29277429d41f0bd41bc3803171ff0e7801588459feac2b4303cd2e21d5c795ce9e56c12ad557b8c123bb5fb479aa3
-SHA512 (kernel-abi-stablelists-5.14.0-229.el9.tar.bz2) = cdd8790c6743c5095fbb2c658043bfb42163ee835eed6598da05b98c686f11c53bb7f20df4f8ce9cd144c4d5cec5fae1b42754e11afe31dad13cd559ccc369f8
-SHA512 (kernel-kabi-dw-5.14.0-229.el9.tar.bz2) = 10ee78eb0d3f35a10a07edcad55be5db5bbf0eda5abe376efd9eb74f4ff47a576be6c59ab0a4e3e081d0dc5de6df05c58d465d4ca1d3e500d2201a1214717491
+SHA512 (linux-5.14.0-230.el9.tar.xz) = 9b1446296444f3af894745e54d32a4da819698369a2d9f14f5e201a0f76aa16d1914fa2929080301d8a7a98e64adad94d33891c0e5122e458fccd841b5121a57
+SHA512 (kernel-abi-stablelists-5.14.0-230.el9.tar.bz2) = 311cfb61b682487d39f7491a3b233285b9d17882634899d705c54d3a6f8e2c4d9762d8eb3689ff9e302fdee3772d49431d5b8f1b651339a1c26ee4ee6f4d048e
+SHA512 (kernel-kabi-dw-5.14.0-230.el9.tar.bz2) = fcdf65be5b51bf39633149723b9673238626571a46443dbf527d4501c21c68f471dcb742f0fa48b3405a572dc0a098d3679e63bf0c217bd14075424f3d8cc8a1