Merge pull request #1038 from zandrey/kernel-update-master

Consolidated Kernel update (v5.10.109+ 5.15.32)

3 files changed, 8 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
index 8aa662eb..88f5bf90 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
@@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v5.10.93
+#    tag: v5.10.109
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
@@ -38,6 +38,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
+#    27b6c760cc7f ("thermal: imx: fix a merging issue")
 #    8ef27ae9f200 ("gpio: fix enabling GPIO_VF610")
 #    12099c38577a ("ASoC: fsl_sai: Correct the clock source for mclk0")
 #    db172377e6e2 ("Revert "MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0"")
@@ -73,14 +74,14 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 KBRANCH = "5.10-2.1.x-imx"
-SRCREV = "f28a9b90c506241e614212f2ce314d8f5460819d"
+SRCREV = "882b6357e0d9303c747ac47dbf1e624a84fcb8dc"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.93"
+LINUX_VERSION = "5.10.109"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
 LOCALVERSION = "-5.10.52-2.1.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
index 4320280e..3e0d0847 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.93"
+LINUX_VERSION = "5.10.109"
 
 KBRANCH = "5.10.x+fslc"
-SRCREV = "de6a8455baae279feddb56c99056aa075175cd68"
+SRCREV = "ad946caa1bfa863f02a56d0741ad3c3dcc772ef8"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb
index 23fc62ac..c67f4265 100644
--- a/recipes-kernel/linux/linux-fslc_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc_5.15.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.15.16"
+LINUX_VERSION = "5.15.32"
 
 KBRANCH = "5.15.x+fslc"
-SRCREV = "d084d166324389d09f73d8f2e91b989d69432335"
+SRCREV = "0cd0faf39b15007499be2f444034c0f62a3eea9a"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"