From 691bc6f7e064560d57d0546e163c524c64a5e79d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 5 Sep 2023 10:37:07 -0400 Subject: [PATCH] linux-yocto/6.4: fix CONFIG_F2FS_IO_TRACE configuration warning Integrating the following commit(s) to linux-yocto/.: 97bba4db5ff 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.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb index 3c168def2cb..7dd3f363253 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "7b9505550d7a84a1f30b9af8b90aafc8dde37023" -SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" +SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" 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.4;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb index 721b52bc8aa..baeca1a968d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" -SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" +SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb index 52accc9f877..23af9167a51 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "9753b4497951a5bd1a921e784532257d26a8b008" SRCREV_machine:qemux86-64 ?= "9753b4497951a5bd1a921e784532257d26a8b008" SRCREV_machine:qemumips64 ?= "de0569e0860973391d16074bbe9366afb15594bf" SRCREV_machine ?= "9753b4497951a5bd1a921e784532257d26a8b008" -SRCREV_meta ?= "d9483a24c9ee33b6e566baa5233cbd9feaeb5212" +SRCREV_meta ?= "97bba4db5ff86eae2ca28a8bf0cb8cbfa44cbbe4" # 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 -- 2.47.2