diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-04-20 07:20:13 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-20 09:54:41 -0300 |
commit | c0523cbd388b07c81622c91915e3b4d478442c84 (patch) | |
tree | 7aea09712db0bf1b3922a83ab3690994c8eacf16 /recipes-kernel/linux | |
parent | 2e8dd74001b63c5ed8aef42554cf640f30c85dbb (diff) | |
download | meta-freescale-c0523cbd388b07c81622c91915e3b4d478442c84.tar.gz |
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 <andrey.z@gmail.com>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 6 |
1 files 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." | |||
28 | # ------------------------------------------------------------------------------ | 28 | # ------------------------------------------------------------------------------ |
29 | # 1. Stable (tag or SHA(s)) | 29 | # 1. Stable (tag or SHA(s)) |
30 | # ------------------------------------------------------------------------------ | 30 | # ------------------------------------------------------------------------------ |
31 | # tag: v5.4.112 | 31 | # tag: v5.4.113 |
32 | # | 32 | # |
33 | # ------------------------------------------------------------------------------ | 33 | # ------------------------------------------------------------------------------ |
34 | # 2. NXP-specific (tag or SHA(s)) | 34 | # 2. NXP-specific (tag or SHA(s)) |
@@ -73,14 +73,14 @@ LICENSE = "GPLv2" | |||
73 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 73 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
74 | 74 | ||
75 | SRCBRANCH = "5.4-2.1.x-imx" | 75 | SRCBRANCH = "5.4-2.1.x-imx" |
76 | SRCREV = "ae2b69f7c60838f7a7a5483c6a805ae9a2a606fd" | 76 | SRCREV = "ac73e0de1af4c060630870dbf3a47d80fc4b181d" |
77 | 77 | ||
78 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 78 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
79 | # required by kernel-yocto.bbclass. | 79 | # required by kernel-yocto.bbclass. |
80 | # | 80 | # |
81 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 81 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
82 | # should be updated once patchlevel is merged. | 82 | # should be updated once patchlevel is merged. |
83 | LINUX_VERSION = "5.4.112" | 83 | LINUX_VERSION = "5.4.113" |
84 | 84 | ||
85 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 85 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
86 | LOCALVERSION = "-imx-5.4.24-2.1.0" | 86 | LOCALVERSION = "-imx-5.4.24-2.1.0" |