From dabdc29e96e962e1b917bdcee2d38d654e28dab5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 5 Sep 2023 10:37:08 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel') 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 be2110ecc9..c78e248cfd 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 () { } SRCREV_machine ?= "9d355978d3a95f5c190a21d95ebb2a5d0e638537" -SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" +SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 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 6b452f3803..93bda2eca2 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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" -SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" +SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index b4601f583e..d1a4bc8538 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" SRCREV_machine:qemux86-64 ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" SRCREV_machine:qemumips64 ?= "296b096f4c747e4c4b31b1708fc8a0acb1dac04e" SRCREV_machine ?= "44fd0c7a5a7955282a1ab24bf3dcdee068839ad2" -SRCREV_meta ?= "295d37e268bc02070da670e46456227bee38795b" +SRCREV_meta ?= "70924d2512b8c20567fade72a22781b9bee3206c" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit 1.2.3-korg