summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-09-05 10:37:08 -0400
committerSteve Sakoman <steve@sakoman.com>2023-10-11 03:54:46 -1000
commit57c2aef3c166eec032f9f278943525cf86329775 (patch)
tree4035af0e8704a3a347ef14cde575c01db13bca2d
parentd235c863d51902534e06d612bd05da3c26665dd5 (diff)
downloadpoky-57c2aef3c166eec032f9f278943525cf86329775.tar.gz
linux-yocto/6.1: fix CONFIG_F2FS_IO_TRACE configuration warning
Integrating the following commit(s) to linux-yocto/.: 70924d2512b features/f2fs: remove CONFIG_F2FS_IO_TRACE (From OE-Core rev: 77ab879e9d71a6fecdf4793b34a68950ffb3cbe2) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dabdc29e96e962e1b917bdcee2d38d654e28dab5) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.1.bb2
3 files changed, 3 insertions, 3 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 d13722b32f..378e2482e3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -15,7 +15,7 @@ python () {
15} 15}
16 16
17SRCREV_machine ?= "9d355978d3a95f5c190a21d95ebb2a5d0e638537" 17SRCREV_machine ?= "9d355978d3a95f5c190a21d95ebb2a5d0e638537"
18SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" 18SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c"
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 a77bd9d183..b1c433a345 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" 20SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2"
21SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" 21SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c"
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 df477b7dee..d020b61c3f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2"
28SRCREV_machine:qemux86-64 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" 28SRCREV_machine:qemux86-64 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2"
29SRCREV_machine:qemumips64 ?= "296b096f4c747e4c4b31b1708fc8a0acb1dac04e" 29SRCREV_machine:qemumips64 ?= "296b096f4c747e4c4b31b1708fc8a0acb1dac04e"
30SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" 30SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2"
31SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" 31SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c"
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