From b4ebf4268369c99432d2c8dc98ea13ca594c1748 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Feb 2024 15:53:28 -0500 Subject: linux-yocto/6.6: features/qat/qat.cfg: enable CONFIG_PCIEAER Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Naveen Saini Email: naveen.kumar.saini@intel.com Subject: features/qat/qat.cfg: enable CONFIG_PCIEAER Date: Fri, 19 Jan 2024 13:29:57 +0800 Error: 4.24.0-00005/qat17/quickassist/qat/drivers/crypto/qat/ qat_common/../../../../compat/qat_compat.c:401:19: error: 'struct pci_dev' has no member named 'aer_cap'; did you mean 'ats_cap'? | 401 | if (!dev->aer_cap) | | ^~~~~~~ | | ats_cap https://github.com/torvalds/linux/blob/296455ade1fdcf5f8f8c033201633b60946c589a/include/linux/pci.h#L339 Signed-off-by: Naveen Saini Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.6.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.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb index d30389124b..25ff894ef2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "59ee8cb752a7e280cfe2d480964aa5b6c74e4203" -SRCREV_meta ?= "48f7c852bd375b9340c68897ccd87ad89ead5f38" +SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c" 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.6;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb index 628a7cbd82..b530990f20 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" -SRCREV_meta ?= "48f7c852bd375b9340c68897ccd87ad89ead5f38" +SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb index ab72df5c61..ed722f2f80 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" SRCREV_machine:qemux86-64 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" SRCREV_machine:qemumips64 ?= "d41c8b84fcfcb4c2dd8eb856172cdc2b6a1bd342" SRCREV_machine ?= "195b2994f955071be3dd16ff61127dbc6b2e0069" -SRCREV_meta ?= "48f7c852bd375b9340c68897ccd87ad89ead5f38" +SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c" # 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