summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-06-27 12:50:40 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-06 13:02:30 +0100
commitbb11763cc748b534429d39c9582617f482b97c65 (patch)
tree803428da6c55275c6867bca235a78b224ccf855b /meta
parentf32e235e83368f6a229d4561c45db6b74be78ce1 (diff)
downloadpoky-bb11763cc748b534429d39c9582617f482b97c65.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: 9fc93ac6fdc3b12eed7fe4cc96ccbef3d5bb31b7) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 63b4761cb1f44aaad4bd0948dc586a90b53049d3) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb18
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
14SRCREV_machine ?= "74f60bcd7323d243e0f3d3db34021ae624afb61a" 14SRCREV_machine ?= "4a59bc57b2be77da9394b10eb37067da7d63b7a4"
15SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" 15SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_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"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "20eb193a68fbdaa56ed9a49b97aef6a0eb9fbdea" 18SRCREV_machine_qemuarm ?= "dd1f9602f3e4e9dc177421ba12ce073ad2099a58"
19SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 19SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8"
20SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" 20SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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"
13KBRANCH_qemux86-64 ?= "v5.10/standard/base" 13KBRANCH_qemux86-64 ?= "v5.10/standard/base"
14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" 14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
15 15
16SRCREV_machine_qemuarm ?= "efa48180fd02b074a2c9e18958fc9b7e4c9f1c00" 16SRCREV_machine_qemuarm ?= "17e89ca08f67fdcbaf0a3ae4c429602f76463923"
17SRCREV_machine_qemuarm64 ?= "139fe7d68413054f850e206ab749f97a968867a8" 17SRCREV_machine_qemuarm64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
18SRCREV_machine_qemumips ?= "aa324c158a84601d99949b7cfa5c376b9691cddc" 18SRCREV_machine_qemumips ?= "bdcaaee7b7ce0e865670a2cee55b1974eb67357b"
19SRCREV_machine_qemuppc ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 19SRCREV_machine_qemuppc ?= "139fe7d68413054f850e206ab749f97a968867a8"
20SRCREV_machine_qemuriscv64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 20SRCREV_machine_qemuriscv64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
21SRCREV_machine_qemuriscv32 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 21SRCREV_machine_qemuriscv32 ?= "139fe7d68413054f850e206ab749f97a968867a8"
22SRCREV_machine_qemux86 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 22SRCREV_machine_qemux86 ?= "139fe7d68413054f850e206ab749f97a968867a8"
23SRCREV_machine_qemux86-64 ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 23SRCREV_machine_qemux86-64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
24SRCREV_machine_qemumips64 ?= "7bc9a08bf3b92db4fdb0225fdd23836c8f5c037f" 24SRCREV_machine_qemumips64 ?= "2f11a726a60ad9e8a48de6bc2101a993b461e8d1"
25SRCREV_machine ?= "9fe9a613a93f7ff39c94e376a15d5fc3ec7a0640" 25SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8"
26SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3" 26SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel