summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-05-02 22:40:36 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-04 15:41:44 +0100
commitc530e42b951b875700a96c4e4a560446c6c160a4 (patch)
tree137ea4b891d55c82f4b0f6395f6da80e2efbe0b9
parent84e146f62606e72d49514dc5b56ffe48809c5d7b (diff)
downloadpoky-c530e42b951b875700a96c4e4a560446c6c160a4.tar.gz
linux-yocto/6.6: cfg: drop obselete options
Integrating the following commit(s) to linux-yocto/.: 1/2 [ Author: Paul Gortmaker Email: paulg@kernel.org Subject: cgl: drop SELINUX_DISABLE option Date: Tue, 16 Apr 2024 12:28:43 -0400 It was removed from mainline in v6.4 in commit f22f9aaf6c3d ("selinux: remove the runtime disable functionality"). Signed-off-by: Paul Gortmaker <paulg@kernel.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] 2/2 [ Author: Paul Gortmaker Email: paulg@kernel.org Subject: full_nohz: remove RCU_FAST_NO_HZ gone from upstream Date: Tue, 16 Apr 2024 14:56:42 -0400 In commit e2c73a6860bd ("rcu: Remove the RCU_FAST_NO_HZ Kconfig option") the so named option was removed from the v5.17 kernel. We should get it out of our active branches to prevent a warning. Signed-off-by: Paul Gortmaker <paulg@kernel.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 8980da85dc1a55be4fcf2cb92859cc6066433531) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.6.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index 91dbbf55ca..0972d4edde 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -15,7 +15,7 @@ python () {
15} 15}
16 16
17SRCREV_machine ?= "5272561b019836f2ee2f175b23029649431d6fca" 17SRCREV_machine ?= "5272561b019836f2ee2f175b23029649431d6fca"
18SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119" 18SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
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.6;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index fba19c97df..3b3e277c38 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24" 20SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
21SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119" 21SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index f887e293b7..a02452feda 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
29SRCREV_machine:qemux86-64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24" 29SRCREV_machine:qemux86-64 ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
30SRCREV_machine:qemumips64 ?= "d3abfe3c736d5869cb26f24c653b7e6eeafac715" 30SRCREV_machine:qemumips64 ?= "d3abfe3c736d5869cb26f24c653b7e6eeafac715"
31SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24" 31SRCREV_machine ?= "4f3a41583a21c529bc7fc3a6c4a33bdffb16fa24"
32SRCREV_meta ?= "3bf5e5e5a7323795af0955da818c6e93215fd119" 32SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
33 33
34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
35# get the <version>/base branch, which is pure upstream -stable, and the same 35# get the <version>/base branch, which is pure upstream -stable, and the same