From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 19 Oct 2023 15:41:57 +0000 (-0400)
Subject: linux-yocto/6.5: config: remove VIDEO_STK1160_COMMON
X-Git-Tag: yocto-5.2~4806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e5a2ac4b38771a01e4561b3a797c42088a89ad4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

linux-yocto/6.5: config: remove VIDEO_STK1160_COMMON

Integrating the following commit(s) to linux-yocto/.:

    4531e74daf0 media/media-usb-tv.cfg: remove VIDEO_STK1160_COMMON

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
index ff61a33db6b..985490e5e5a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
@@ -15,7 +15,7 @@ python () {
 }
 
 SRCREV_machine ?= "541ff832e9f2a168145f96ff41857a6cf1c74289"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"
 
 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.5;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
index 6ed99725490..e2214851abe 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "8ad515e79001700d5e3d36e6ffe37ebdae2b5cd4"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"
 
 PV = "${LINUX_VERSION}+git"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
index f63b93ce491..bd99b54bced 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
 SRCREV_machine:qemux86-64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
 SRCREV_machine:qemumips64 ?= "59ac3aaf836bd355d0f9f734e7bcca3dde44573a"
 SRCREV_machine ?= "79a314e29b53062b4dfd316569d5480ee0d19249"
-SRCREV_meta ?= "7686d2c442df26daa77f91098f7fac8fdf5b35d7"
+SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same