diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7ecca06..fa9516f 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 3
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 303
+RHEL_RELEASE = 304
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index b0e9d95..5a6ffab 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -2510,6 +2510,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4663,6 +4664,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 443cfe7..f92f9e2 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -2494,6 +2494,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4641,6 +4642,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 91c6995..1f6e3eb 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2507,6 +2507,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4660,6 +4661,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 5240fbe..616ea57 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2491,6 +2491,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4638,6 +4639,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 2cce47d..a171ea9 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -2560,6 +2560,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4751,6 +4752,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index b917b23..6fc52f0 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -2544,6 +2544,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT_IMX8MM=m
 CONFIG_INTERCONNECT_IMX8MN=m
+# CONFIG_INTERCONNECT_IMX8MP is not set
 CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_INTERCONNECT_IMX=m
 # CONFIG_INTERCONNECT_QCOM is not set
@@ -4729,6 +4730,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ABB5ZES3=m
 # CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 # CONFIG_RTC_DRV_CADENCE is not set
diff --git a/kernel.spec b/kernel.spec
index 81c39eb..1dfa21d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -161,15 +161,15 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 5.14.0
 %define patchversion 5.14
-%define pkgrelease 303
+%define pkgrelease 304
 %define kversion 5
-%define tarfile_release 5.14.0-303.el9
+%define tarfile_release 5.14.0-304.el9
 # This is needed to do merge window version magic
 %define patchlevel 14
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 303%{?buildid}%{?dist}
+%define specrelease 304%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 5.14.0-303.el9
+%define kabiversion 5.14.0-304.el9
 
 #
 # End of genspec.sh variables
@@ -3601,6 +3601,33 @@ fi
 #
 #
 %changelog
+* Tue Apr 25 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-304.el9]
+- redhat/configs: turn off BBNSM RTC Driver (Steve Best) [2182332]
+- dt-bindings: mfd: Add NXP BBNSM (Steve Best) [2182332]
+- rtc: bbnsm: Add the bbnsm rtc support (Steve Best) [2182332]
+- redhat/configs: turn off i.MX8MP interconnect Driver (Steve Best) [2184106]
+- interconnect: imx: Make imx_icc_unregister() return void (Steve Best) [2184106]
+- interconnect: imx: Ignore return value of icc_provider_del() in .remove() (Steve Best) [2184106]
+- interconnect: imx: Add platform driver for imx8mp (Steve Best) [2184106]
+- interconnect: imx: configure NoC mode/prioriry/ext_control (Steve Best) [2184106]
+- interconnect: imx: introduce imx_icc_provider (Steve Best) [2184106]
+- interconnect: imx: set src node (Steve Best) [2184106]
+- interconnect: imx: fix max_node_id (Steve Best) [2184106]
+- NFSv4: Fix hangs when recovering open state after a server reboot (Benjamin Coddington) [2186011]
+- scsi: ses: Don't attach if enclosure has no components (Tomas Henzl) [2102283]
+- scsi: ses: Fix slab-out-of-bounds in ses_intf_remove() (Tomas Henzl) [2102283]
+- scsi: ses: Fix possible desc_ptr out-of-bounds accesses (Tomas Henzl) [2102283]
+- scsi: ses: Fix possible addl_desc_ptr out-of-bounds accesses (Tomas Henzl) [2102283]
+- scsi: ses: Fix slab-out-of-bounds in ses_enclosure_data_process() (Tomas Henzl) [2102283]
+- vmxnet3: move rss code block under eop descriptor (Izabela Bakollari) [2169514]
+- selftests: forwarding: add tunnel_key "nofrag" test case (Davide Caratti) [2183450]
+- selftests: tc-testing: add tunnel_key "nofrag" test case (Davide Caratti) [2183450]
+- selftests: tc-testing: add "depends_on" property to skip tests (Davide Caratti) [2183450]
+- net/sched: act_tunnel_key: add support for "don't fragment" (Davide Caratti) [2183450]
+- NFSD: fix use-after-free in nfsd4_ssc_setup_dul() (Jeffrey Layton) [2182039] {CVE-2023-1652}
+- sched/core: Fix arch_scale_freq_tick() on tickless systems (Phil Auld) [1996625]
+- perf/x86/intel: Add Cooper Lake stepping to isolation_ucodes[] (Michael Petlan) [2153897]
+
 * Sat Apr 22 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-303.el9]
 - vfs: remove the FL_EXT_LMOPS flag (Jeffrey Layton) [2185616]
 - SUNRPC: Fix a server shutdown leak (Benjamin Coddington) [2180601]
diff --git a/sources b/sources
index 569fe45..ee121a5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-303.el9.tar.xz) = 5f9599a7d1725669abb75b69e6c5704a821d7e84f1ef4421af251ec4c8a17c31516063337b095c88bb90852d72f12704dba5cbbf445931bbf2db2f11b0b5c3be
-SHA512 (kernel-abi-stablelists-5.14.0-303.el9.tar.bz2) = e3d74ad4336dbe4a6df85b0a0a5fecc39ece2e9cc93aa0cfa2dd4be61c7ea40678c04f9130f3868b133da0ff4b7cd4d9f2c5f9a95fee0b3a7f33c1893a2a1b62
-SHA512 (kernel-kabi-dw-5.14.0-303.el9.tar.bz2) = c3cc16835c76de75ff1d7727cd2b1610c457001424a88cb61d3efa721358eff986aeda74c85ea3f17e115aa318ba585e37c25a449ef0b994cbde7ef6a7aa9d35
+SHA512 (linux-5.14.0-304.el9.tar.xz) = d30e0c1382ff1f16a2514f98956ab453168323e171896603bc92b91a211795ac0152560ebc56cc73f3060dd6e294401fc311428fbb091f24f7217fedab20a59a
+SHA512 (kernel-abi-stablelists-5.14.0-304.el9.tar.bz2) = cdeb93819a90fdf6ced602f6ad8fad349ce068b8af68fab9e4aa40866d623700acc95897aef1c89b1dbaba75649c3097107f7f36957f79bf0b71e5b881bfe9cf
+SHA512 (kernel-kabi-dw-5.14.0-304.el9.tar.bz2) = c3cc16835c76de75ff1d7727cd2b1610c457001424a88cb61d3efa721358eff986aeda74c85ea3f17e115aa318ba585e37c25a449ef0b994cbde7ef6a7aa9d35