Merge pull request #1112 from zandrey/topic/kernel-update-master

Consolidated Kernel update (v5.15.48 + v5.18.5)

7 files changed, 30 insertions, 10 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
index f4697de8..3c385e2a 100644
--- a/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/imx-nxp-bsp/defconfig
@@ -1,4 +1,3 @@
-CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
index 926a4956..336cf1c7 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.15.bb
@@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v5.15.46
+#    tag: v5.15.48
 #
 # ------------------------------------------------------------------------------
 # 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))
 # ------------------------------------------------------------------------------
+#    aa0d6324254a ("ARM: imx_v6/v7: config: remove lzo compression")
 #    78a61d752a68 ("staging: fsl_ppfe: reduce MAC address filtering loglevel to debug")
 #    119775ff0b40 ("staging: fsl_ppfe: assign correct OF nodes to individual ports")
 #    f696b8a03198 ("staging: fsl_ppfe: handle all RGMII modes in pfe_eth_adjust_link")
@@ -70,14 +71,14 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 KBRANCH = "5.15-1.0.x-imx"
-SRCREV = "2badd023089aeeadb482300d5d409d6deece659c"
+SRCREV = "b6597629c15cf4fc99dbcdaa079cb1b4c3e92f2e"
 
 # 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.15.46"
+LINUX_VERSION = "5.15.48"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
 LOCALVERSION = "-5.15.5-1.0.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts/defconfig b/recipes-kernel/linux/linux-fslc-lts/defconfig
index 7078f912..34152353 100644
--- a/recipes-kernel/linux/linux-fslc-lts/defconfig
+++ b/recipes-kernel/linux/linux-fslc-lts/defconfig
@@ -1,4 +1,3 @@
-CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.15.bb b/recipes-kernel/linux/linux-fslc-lts_5.15.bb
index edf45d3b..62550b4b 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_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.46"
+LINUX_VERSION = "5.15.48"
 
 KBRANCH = "5.15.x+fslc"
-SRCREV = "b0d7488836b992745e42ac055cb9bd59ba29c3ae"
+SRCREV = "d14543c880490dfa74c3e2e684634f8f9ed41cec"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index 773a3148..91104c53 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -1,4 +1,3 @@
-CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/recipes-kernel/linux/linux-fslc_5.18.bb b/recipes-kernel/linux/linux-fslc_5.18.bb
index b1fdd07e..363a2989 100644
--- a/recipes-kernel/linux/linux-fslc_5.18.bb
+++ b/recipes-kernel/linux/linux-fslc_5.18.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.18.3"
+LINUX_VERSION = "5.18.5"
 
 KBRANCH = "5.18.x+fslc"
-SRCREV = "3e911e32b6228ba4a05f476830c0179aa99d5985"
+SRCREV = "1d6b3055ae6a2ab50a911a6482dbd750c09cd3e0"
 
 COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/v5.15.48-v5.15.47.log b/v5.15.48-v5.15.47.log
new file mode 100644
index 00000000..ceebe069
--- /dev/null
+++ b/v5.15.48-v5.15.47.log
@@ -0,0 +1,22 @@
+linux-fslc-imx: update to v5.15.48
+
+Kernel repository has been upgraded up to v5.15.48 from stable korg.
+
+Following upstream commits are included in this version:
+----
+e1dd58c995da Linux 5.15.48
+147ae04a7c52 x86/speculation/mmio: Print SMT warning
+59d665a709b0 KVM: x86/speculation: Disable Fill buffer clear within guests
+ebd0f558b480 x86/speculation/mmio: Reuse SRBDS mitigation for SBDS
+30120b433c1f x86/speculation/srbds: Update SRBDS mitigation selection
+531eb5fe3171 x86/speculation/mmio: Add sysfs reporting for Processor MMIO Stale Data
+2044838ab228 x86/speculation/mmio: Enable CPU Fill buffer clearing on idle
+407d97b99f27 x86/bugs: Group MDS, TAA & Processor MMIO Stale Data mitigations
+d74f4eb1ddf0 x86/speculation/mmio: Add mitigation for Processor MMIO Stale Data
+8b9521e71179 x86/speculation: Add a common function for MD_CLEAR mitigation update
+d822b10f97f6 x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug
+1fcc3d646f0b Documentation: Add documentation for Processor MMIO Stale Data
+----
+
+Link: https://lore.kernel.org/r/20220614183720.512073672@linuxfoundation.org # v5.15.48
+Link: https://github.com/Freescale/linux-fslc/pull/587