From bb44f79c4025b16ab054c186546d956c608a8aad Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 18 Nov 2022 17:28:57 -0500 Subject: linux-yocto/5.19: fix CONFIG_CRYPTO_CCM mismatch warnings Integrating the following commit(s) to linux-yocto/.: 0cba9aa4044 qat: fix CONFIG_CRYPTO_CCM mismatch warnings Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit a2e40db0d957bc8b7e77e5f54e6646bb633ef42f) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.19.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index 2b12b8b8df..5c316dbaf3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "2bd6711a4dcc49e51ae68152ed0b40384e291554" -SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" +SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" 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.19;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 0dd3816dc5..27fa6d9867 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb @@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" -SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" +SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index b242dfa27a..44bb02b9c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" SRCREV_machine:qemux86-64 ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" SRCREV_machine:qemumips64 ?= "20d5adcd760ffdc90b4e5babb85a07b9d6ff3113" SRCREV_machine ?= "ccb5f0a475b228c995800cb1b0f714426c2f1ec8" -SRCREV_meta ?= "7381acde368f24529d8c9face1826fb54bf7feee" +SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" # 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