summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-06-14 23:16:08 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-15 21:25:42 +0100
commitb6ab7d6bf33bac3d3d9266bf04513a1a65bcad51 (patch)
treeceb41f158d7ff29b607603f4715df737d9bbda61 /meta
parent424c66331336ebe606e67da3ce74c4d8fb8e2544 (diff)
downloadpoky-b6ab7d6bf33bac3d3d9266bf04513a1a65bcad51.tar.gz
linux-yocto/6.1: fix intermittent x86 boot hangs
The commit in question appeared as -stable backport in 6.1.28, which is where we started to see intermittent boot hangs on x86. Richard noted that others are seeing this is well, as can be seen in this thread: https://lkml.org/lkml/2023/6/13/1460 We bump our SRCREVs to pick up the revert: 947f660bde07 Revert "tick/common: Align tick period with the HZ tick." (From OE-Core rev: 73b7f36e51de39ed19dfd3cd253be1876db60ca4) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.1.bb24
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index 4a2a3ca4ab..1033d307f4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,8 +14,8 @@ python () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "6871194107bd40397162bfca0a9ef06661057c50" 17SRCREV_machine ?= "2993cbe41f0f859331c81d6ec8001b094f53cb9e"
18SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3" 18SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index bfc1c7652c..2be9eb9c36 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 20SRCREV_machine ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
21SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3" 21SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
22 22
23PV = "${LINUX_VERSION}+git${SRCPV}" 23PV = "${LINUX_VERSION}+git${SRCPV}"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 43cc4ad6f4..460655dd6c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -17,18 +17,18 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
17KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" 17KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
18KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" 18KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
19 19
20SRCREV_machine:qemuarm ?= "cff918ff5ee0001dec6493620535d8804f02cd8b" 20SRCREV_machine:qemuarm ?= "93797f49c15b6ce9656a607626437e76a3b6c6da"
21SRCREV_machine:qemuarm64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 21SRCREV_machine:qemuarm64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
22SRCREV_machine:qemuloongarch64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 22SRCREV_machine:qemuloongarch64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
23SRCREV_machine:qemumips ?= "7a59adc4cd39bea852101be2873855cfc835ef45" 23SRCREV_machine:qemumips ?= "1279631d08d52a5b20044404da4b01205ba4b725"
24SRCREV_machine:qemuppc ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 24SRCREV_machine:qemuppc ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
25SRCREV_machine:qemuriscv64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 25SRCREV_machine:qemuriscv64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
26SRCREV_machine:qemuriscv32 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 26SRCREV_machine:qemuriscv32 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
27SRCREV_machine:qemux86 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 27SRCREV_machine:qemux86 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
28SRCREV_machine:qemux86-64 ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 28SRCREV_machine:qemux86-64 ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
29SRCREV_machine:qemumips64 ?= "273e099163a72247262a495cb73889d2e0ed6d2c" 29SRCREV_machine:qemumips64 ?= "3b25f845f704021fbe223ef48ab22ff5fa3886b9"
30SRCREV_machine ?= "6034b10d39687bbd6769e4adb2a792524e6b4f16" 30SRCREV_machine ?= "947f660bde07ee4111bc96d08b142a6ce3753d38"
31SRCREV_meta ?= "1dd270d3231f82d94d2123b95e4eb576019440a3" 31SRCREV_meta ?= "db25e51e2006721528f5e7bcd8f4501592bd74fe"
32 32
33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
34# get the <version>/base branch, which is pure upstream -stable, and the same 34# get the <version>/base branch, which is pure upstream -stable, and the same