diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-06-16 16:48:54 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-17 13:42:31 +0100 |
commit | 529bb922c786f1acd041ff9a8d2b675d067e2ae3 (patch) | |
tree | 0867f9e8e2adb44c6ca94884efe23dfa19a9ba21 /meta/recipes-kernel | |
parent | 381b83cae2f8119930b41bc874ae1ab522ea16ca (diff) | |
download | poky-529bb922c786f1acd041ff9a8d2b675d067e2ae3.tar.gz |
linux-yocto/5.10: cgroup1: fix leaked context root causing sporadic NULL deref in LTP
Integrating the following commit(s) to linux-yocto/5.10:
ab49d2db98bd cgroup1: fix leaked context root causing sporadic NULL deref in LTP
PaulG tracked down the AB intermittent issues and generated a kernel
patch.
See: https://lore.kernel.org/lkml/20210616125157.438837-1-paul.gortmaker@windriver.com/
While we wait for it to loop through mainline, we'll integrate it into
our 5.10 branches.
(From OE-Core rev: 9a16dff746dd7ffd48ee8d1a17babef682168ead)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
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 | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 |
3 files changed, 16 insertions, 16 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 d1ff473e3c..877e8d2946 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -11,8 +11,8 @@ 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 ?= "f458a6a097da0e7c535361dd30037499a48699f7" | 14 | SRCREV_machine ?= "6186341e981ad4fd3941c7c9af509923bbe2a2a5" |
15 | SRCREV_meta ?= "7fab6536c164fd743f17c52bc56a65867e30903a" | 15 | SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" |
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 \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
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 19aa7ab7d5..b44deb6f32 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,9 +15,9 @@ 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 ?= "e2c5237e9be3f4c69e86d7b990347454e2b8dff2" | 18 | SRCREV_machine_qemuarm ?= "9c63dda7dd5834bf731747d6ae03ae13d48e20e3" |
19 | SRCREV_machine ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 19 | SRCREV_machine ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
20 | SRCREV_meta ?= "7fab6536c164fd743f17c52bc56a65867e30903a" | 20 | SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 7205df2a61..f99782c1be 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,17 +13,17 @@ 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 ?= "592f67240407a1f071d1b90e0af74df07deac519" | 16 | SRCREV_machine_qemuarm ?= "2fc3409cf8c2a6d684929576fd409949060a0bd9" |
17 | SRCREV_machine_qemuarm64 ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 17 | SRCREV_machine_qemuarm64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
18 | SRCREV_machine_qemumips ?= "0f474718e48ea5732875db2b71cf3f5dd3293e31" | 18 | SRCREV_machine_qemumips ?= "5cec6d1ab35feb99f023b233871cafa29e3c3682" |
19 | SRCREV_machine_qemuppc ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 19 | SRCREV_machine_qemuppc ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
20 | SRCREV_machine_qemuriscv64 ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 20 | SRCREV_machine_qemuriscv64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
21 | SRCREV_machine_qemuriscv32 ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 21 | SRCREV_machine_qemuriscv32 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
22 | SRCREV_machine_qemux86 ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 22 | SRCREV_machine_qemux86 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
23 | SRCREV_machine_qemux86-64 ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 23 | SRCREV_machine_qemux86-64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
24 | SRCREV_machine_qemumips64 ?= "a3c3c412a703def1f5c8f94f2c0fcc2cb908693a" | 24 | SRCREV_machine_qemumips64 ?= "769a7118662a2256e20df60be9c9727f9c5878b0" |
25 | SRCREV_machine ?= "a68fc0180ae168b5af017e9071e183e1a51e4569" | 25 | SRCREV_machine ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" |
26 | SRCREV_meta ?= "7fab6536c164fd743f17c52bc56a65867e30903a" | 26 | SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE_qemuarm ?= "qemuarma15" | 29 | # KMACHINE_qemuarm ?= "qemuarma15" |