diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-06-27 12:50:40 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-27 22:51:05 +0100 |
commit | 1f802cdf857475eefb9f3ae5032a6f1ce3e01d97 (patch) | |
tree | e63d3e9b467673ea009af5c66fa2da0191fa163a /meta/recipes-kernel | |
parent | 8c62c9b73a965e0a84cc61b609eacdc27076d4c4 (diff) | |
download | poky-1f802cdf857475eefb9f3ae5032a6f1ce3e01d97.tar.gz |
linux-yocto/5.10: rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock
Integrating the following commit(s) to linux-yocto/5.10:
139fe7d68413 rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock
(From OE-Core rev: 63b4761cb1f44aaad4bd0948dc586a90b53049d3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index ea2c854649..f511f233b6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -11,7 +11,7 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "74f60bcd7323d243e0f3d3db34021ae624afb61a" | 14 | SRCREV_machine ?= "4a59bc57b2be77da9394b10eb37067da7d63b7a4" |
15 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" | 15 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index d73b1d0305..f5ade2992c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "20eb193a68fbdaa56ed9a49b97aef6a0eb9fbdea" | 18 | SRCREV_machine_qemuarm ?= "dd1f9602f3e4e9dc177421ba12ce073ad2099a58" |
19 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 19 | SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8" |
20 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" | 20 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index c3342da193..dd4aef7f89 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,16 +13,16 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" | |||
13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "efa48180fd02b074a2c9e18958fc9b7e4c9f1c00" | 16 | SRCREV_machine_qemuarm ?= "17e89ca08f67fdcbaf0a3ae4c429602f76463923" |
17 | SRCREV_machine_qemuarm64 ?= "139fe7d68413054f850e206ab749f97a968867a8" | 17 | SRCREV_machine_qemuarm64 ?= "139fe7d68413054f850e206ab749f97a968867a8" |
18 | SRCREV_machine_qemumips ?= "aa324c158a84601d99949b7cfa5c376b9691cddc" | 18 | SRCREV_machine_qemumips ?= "bdcaaee7b7ce0e865670a2cee55b1974eb67357b" |
19 | SRCREV_machine_qemuppc ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 19 | SRCREV_machine_qemuppc ?= "139fe7d68413054f850e206ab749f97a968867a8" |
20 | SRCREV_machine_qemuriscv64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 20 | SRCREV_machine_qemuriscv64 ?= "139fe7d68413054f850e206ab749f97a968867a8" |
21 | SRCREV_machine_qemuriscv32 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 21 | SRCREV_machine_qemuriscv32 ?= "139fe7d68413054f850e206ab749f97a968867a8" |
22 | SRCREV_machine_qemux86 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 22 | SRCREV_machine_qemux86 ?= "139fe7d68413054f850e206ab749f97a968867a8" |
23 | SRCREV_machine_qemux86-64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 23 | SRCREV_machine_qemux86-64 ?= "139fe7d68413054f850e206ab749f97a968867a8" |
24 | SRCREV_machine_qemumips64 ?= "7bc9a08bf3b92db4fdb0225fdd23836c8f5c037f" | 24 | SRCREV_machine_qemumips64 ?= "2f11a726a60ad9e8a48de6bc2101a993b461e8d1" |
25 | SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" | 25 | SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8" |
26 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" | 26 | SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |