From cd9dc8d13335803d1160455cf762369ec64d3f35 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 18 Nov 2022 17:28:58 -0500 Subject: linux-yocto/5.15: fix CONFIG_CRYPTO_CCM mismatch warnings Integrating the following commit(s) to linux-yocto/.: f475b1a9ded qat: fix CONFIG_CRYPTO_CCM mismatch warnings Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit a3417ce85e38d514c7dc43c2ddcdacf45996fc2a) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index f80cabe55d..fc1ccd9b39 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "a0d36398b257c555381e735cd721cd8479d6762d" -SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" +SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index c09f51ce61..087c30b5a5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" -SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" +SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 710accc9e2..d5f21daf35 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_meta ?= "5ca1021282e796e2427f8c7769af524c433fb39d" +SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" # 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