diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch
deleted file mode 100644
index 66efde1..0000000
--- a/meta-raspberrypi/recipes-kernel/linux/files/0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 754e3030788702c1f013a88a4fc8546742d84e27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 18 Jun 2020 13:45:04 -0700
-Subject: [PATCH] Revert "selftests/bpf: Skip perf hw events test if the setup
- disabled it"
-
-This reverts commit da43712a7262891317883d4b3a909fb18dac4b1d.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../selftests/bpf/prog_tests/stacktrace_build_id_nmi.c    | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
-index 437cb93e72ac..f62aa0eb959b 100644
---- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
-+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
-@@ -49,12 +49,8 @@ void test_stacktrace_build_id_nmi(void)
- 	pmu_fd = syscall(__NR_perf_event_open, &attr, -1 /* pid */,
- 			 0 /* cpu 0 */, -1 /* group id */,
- 			 0 /* flags */);
--	if (pmu_fd < 0 && errno == ENOENT) {
--		printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__);
--		test__skip();
--		goto close_prog;
--	}
--	if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n",
-+	if (CHECK(pmu_fd < 0, "perf_event_open",
-+		  "err %d errno %d. Does the test host support PERF_COUNT_HW_CPU_CYCLES?\n",
- 		  pmu_fd, errno))
- 		goto close_prog;
- 
--- 
-2.27.0
-
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
new file mode 100644
index 0000000..447a5e4
--- /dev/null
+++ b/meta-raspberrypi/recipes-kernel/linux/files/0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
@@ -0,0 +1,48 @@
+From 32f53700aeef2f5c7797ddda66348fc0b29e1047 Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Wed, 18 Jan 2023 12:21:35 -0800
+Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13
+
+The gimple-iterator.h header must be included before gimple-fold.h
+starting with GCC 13. Reorganize gimple headers to work for all GCC
+versions.
+
+Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
+Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
+Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
+Cc: linux-hardening@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+---
+ scripts/gcc-plugins/gcc-common.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
+index 0c087614fc3e..27770c31214c 100644
+--- a/scripts/gcc-plugins/gcc-common.h
++++ b/scripts/gcc-plugins/gcc-common.h
+@@ -77,8 +77,10 @@
+ #include "varasm.h"
+ #include "stor-layout.h"
+ #include "internal-fn.h"
++#include "gimple.h"
+ #include "gimple-expr.h"
+ #include "gimple-fold.h"
++#include "gimple-iterator.h"
+ #include "context.h"
+ #include "tree-ssa-alias.h"
+ #include "tree-ssa.h"
+@@ -91,11 +93,9 @@
+ #include "tree-eh.h"
+ #include "stmt.h"
+ #include "gimplify.h"
+-#include "gimple.h"
+ #include "tree-ssa-operands.h"
+ #include "tree-phinodes.h"
+ #include "tree-cfg.h"
+-#include "gimple-iterator.h"
+ #include "gimple-ssa.h"
+ #include "ssa-iterators.h"
+ 
+-- 
+2.39.1
+
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch b/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch
deleted file mode 100644
index d18b942..0000000
--- a/meta-raspberrypi/recipes-kernel/linux/files/0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 366487b86a8c87954fb4ab7bd88ab49a929a32f6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Apr 2020 11:25:58 -0700
-Subject: [PATCH 2/2] Revert "selftests/bpf: Fix perf_buffer test on systems w/
- offline CPUs"
-
-This reverts commit 77bb53cb094828a31cd3c5b402899810f63073c1.
----
- .../selftests/bpf/prog_tests/perf_buffer.c    | 29 ++++---------------
- 1 file changed, 5 insertions(+), 24 deletions(-)
-
-diff --git a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
-index cf6c87936c69..3003fddc0613 100644
---- a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
-+++ b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c
-@@ -4,7 +4,6 @@
- #include <sched.h>
- #include <sys/socket.h>
- #include <test_progs.h>
--#include "libbpf_internal.h"
- 
- static void on_sample(void *ctx, int cpu, void *data, __u32 size)
- {
-@@ -20,7 +19,7 @@ static void on_sample(void *ctx, int cpu, void *data, __u32 size)
- 
- void test_perf_buffer(void)
- {
--	int err, prog_fd, on_len, nr_on_cpus = 0,  nr_cpus, i, duration = 0;
-+	int err, prog_fd, nr_cpus, i, duration = 0;
- 	const char *prog_name = "kprobe/sys_nanosleep";
- 	const char *file = "./test_perf_buffer.o";
- 	struct perf_buffer_opts pb_opts = {};
-@@ -30,27 +29,15 @@ void test_perf_buffer(void)
- 	struct bpf_object *obj;
- 	struct perf_buffer *pb;
- 	struct bpf_link *link;
--	bool *online;
- 
- 	nr_cpus = libbpf_num_possible_cpus();
- 	if (CHECK(nr_cpus < 0, "nr_cpus", "err %d\n", nr_cpus))
- 		return;
- 
--	err = parse_cpu_mask_file("/sys/devices/system/cpu/online",
--				  &online, &on_len);
--	if (CHECK(err, "nr_on_cpus", "err %d\n", err))
--		return;
--
--	for (i = 0; i < on_len; i++)
--		if (online[i])
--			nr_on_cpus++;
--
- 	/* load program */
- 	err = bpf_prog_load(file, BPF_PROG_TYPE_KPROBE, &obj, &prog_fd);
--	if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno)) {
--		obj = NULL;
--		goto out_close;
--	}
-+	if (CHECK(err, "obj_load", "err %d errno %d\n", err, errno))
-+		return;
- 
- 	prog = bpf_object__find_program_by_title(obj, prog_name);
- 	if (CHECK(!prog, "find_probe", "prog '%s' not found\n", prog_name))
-@@ -77,11 +64,6 @@ void test_perf_buffer(void)
- 	/* trigger kprobe on every CPU */
- 	CPU_ZERO(&cpu_seen);
- 	for (i = 0; i < nr_cpus; i++) {
--		if (i >= on_len || !online[i]) {
--			printf("skipping offline CPU #%d\n", i);
--			continue;
--		}
--
- 		CPU_ZERO(&cpu_set);
- 		CPU_SET(i, &cpu_set);
- 
-@@ -99,8 +81,8 @@ void test_perf_buffer(void)
- 	if (CHECK(err < 0, "perf_buffer__poll", "err %d\n", err))
- 		goto out_free_pb;
- 
--	if (CHECK(CPU_COUNT(&cpu_seen) != nr_on_cpus, "seen_cpu_cnt",
--		  "expect %d, seen %d\n", nr_on_cpus, CPU_COUNT(&cpu_seen)))
-+	if (CHECK(CPU_COUNT(&cpu_seen) != nr_cpus, "seen_cpu_cnt",
-+		  "expect %d, seen %d\n", nr_cpus, CPU_COUNT(&cpu_seen)))
- 		goto out_free_pb;
- 
- out_free_pb:
-@@ -109,5 +91,4 @@ void test_perf_buffer(void)
- 	bpf_link__destroy(link);
- out_close:
- 	bpf_object__close(obj);
--	free(online);
- }
--- 
-2.26.0
-
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4/rpi4-nvmem.cfg b/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4/rpi4-nvmem.cfg
new file mode 100644
index 0000000..0248162
--- /dev/null
+++ b/meta-raspberrypi/recipes-kernel/linux/files/raspberrypi4/rpi4-nvmem.cfg
@@ -0,0 +1 @@
+CONFIG_NVMEM_RMEM=y
diff --git a/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc b/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc
new file mode 100644
index 0000000..bb6fffd
--- /dev/null
+++ b/meta-raspberrypi/recipes-kernel/linux/files/rpi.scc
@@ -0,0 +1 @@
+patch 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
index 4f67d29..d2f3f48 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
@@ -17,6 +17,10 @@
     ${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "file://wm8960.cfg", "", d)} \
     "
 
+SRC_URI:append:raspberrypi4 = " \
+    file://rpi4-nvmem.cfg \
+"
+
 KCONFIG_MODE = "--alldefconfig"
 KBUILD_DEFCONFIG:raspberrypi0-wifi ?= "bcmrpi_defconfig"
 KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig"
diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb
index 468737c..02ab825 100644
--- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb
+++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb
@@ -1,8 +1,8 @@
-LINUX_VERSION ?= "5.15.56"
+LINUX_VERSION ?= "5.15.90"
 LINUX_RPI_BRANCH ?= "rpi-5.15.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15"
 
-SRCREV_machine = "a90998a3e549911234f9f707050858b98b71360f"
+SRCREV_machine = "18d8d0236d45f0fe9082548f23a0ab4379d8c106"
 SRCREV_meta = "3b1dc2f1fcd869f97901402759b859035984aa7f"
 
 KMETA = "kernel-meta"
@@ -10,6 +10,7 @@
 SRC_URI = " \
     git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
     git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
+    file://rpi.scc \
     file://powersave.cfg \
     file://android-drivers.cfg \
     "