From c0523cbd388b07c81622c91915e3b4d478442c84 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 20 Apr 2021 07:20:13 +0000 Subject: [PATCH] linux-fslc-imx: update to v5.4.113 Kernel repository has been upgraded to v5.4.113 from stable korg. Following conflicts were resolved during merge: ---- - drivers/gpu/drm/imx/imx-ldb.c: Merge manually upstream commit 3c89c72404121 ("drm/imx: imx-ldb: fix out of bounds array access warning") with NXP version if imx-ldb driver. ---- Following upstream commits are included in this version: ---- ab3bed80f9d3 Linux 5.4.113 94371b6c5553 xen/events: fix setting irq affinity 4ea6097986c4 perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches d462247bb274 perf tools: Use %zd for size_t printf formats on 32-bit 2715a4c0dc34 perf tools: Use %define api.pure full instead of %pure-parser 799f02f0dfc4 driver core: Fix locking bug in deferred_probe_timeout_work_func() cc59b872f2e1 netfilter: x_tables: fix compat match/target pad out-of-bound write 8119a2b42028 block: don't ignore REQ_NOWAIT for direct IO 2d71bffbe9a0 riscv,entry: fix misaligned base for excp_vect_table 90b71ae8e5cf idr test suite: Create anchor before launching throbber b9299c2bf554 idr test suite: Take RCU read lock in idr_find_test_1 cde89079ce46 radix tree test suite: Register the main thread with the RCU library f5b60f26e36b block: only update parent bi_status when bio fail 5b8f89685a9a drm/tegra: dc: Don't set PLL clock to 0Hz db162d8d7d08 gfs2: report "already frozen/thawed" errors 3c89c7240412 drm/imx: imx-ldb: fix out of bounds array access warning e1ff1c6bbe4b KVM: arm64: Disable guest access to trace filter controls 2012f9f75444 KVM: arm64: Hide system instruction access to Trace registers cc678e2f372e interconnect: core: fix error return code of icc_link_destroy() ---- Link: https://lore.kernel.org/r/20210415144413.055232956@linuxfoundation.org Signed-off-by: Andrey Zhizhikin --- recipes-kernel/linux/linux-fslc-imx_5.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index 44abd1c1..09597447 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb @@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v5.4.112 +# tag: v5.4.113 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) @@ -73,14 +73,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" SRCBRANCH = "5.4-2.1.x-imx" -SRCREV = "ae2b69f7c60838f7a7a5483c6a805ae9a2a606fd" +SRCREV = "ac73e0de1af4c060630870dbf3a47d80fc4b181d" # 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.4.112" +LINUX_VERSION = "5.4.113" # Local version indicates the branch name in the NXP kernel tree where patches are collected from. LOCALVERSION = "-imx-5.4.24-2.1.0" -- 2.40.1