diff --git a/recipes-kernel/linux/files/defconfig b/recipes-kernel/linux/files/defconfig
index 73bf840..68f48c4 100644
--- a/recipes-kernel/linux/files/defconfig
+++ b/recipes-kernel/linux/files/defconfig
@@ -154,9 +154,9 @@
 
 # Features useful if a machine enables pstore for dumps
 CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=n
-CONFIG_PSTORE_ZSTD_COMPRESS=y
-CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=n <6.6-rc0
+CONFIG_PSTORE_ZSTD_COMPRESS=y <6.6-rc0
+CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT=y <6.6-rc0
 CONFIG_PRINTK_TIME=y
 
 # Watchdog Related Configuration
diff --git a/recipes-kernel/linux/linux-gbmc_mainline.bb b/recipes-kernel/linux/linux-gbmc_mainline.bb
new file mode 100644
index 0000000..98a7ec3
--- /dev/null
+++ b/recipes-kernel/linux/linux-gbmc_mainline.bb
@@ -0,0 +1,20 @@
+require linux-gbmc.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/stable:"
+KBRANCH = "master"
+PV:prepend = "mainline-"
+KERNEL_VERSION_SANITY_SKIP = "1"
+LINUX_VERSION = "6.6.0"
+SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI:append = " file://linux-gbmc-stable"
+
+SRC_URI:append = " \
+  file://0001-jffs2-add-RENAME_EXCHANGE-support.patch \
+  file://0001-mux-Make-it-possible-to-select-MULTIPLEXER-if-EXPERT.patch \
+  "
+
+do_patch:prepend() {
+  cp -r ${WORKDIR}/linux-gbmc-stable/* ${S}/
+}