linux-intel/6.11 : update to tag mainline-tracking-pre-prod-v6.11-linux-240925T085433Z

* Drop recipe for 6.10 kernel
* Drop the patch 0001-6.10-vt-conmakehash-improve-reproducibility.patch
* Add recipe for 6.11 kernel

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 6 insertions, 65 deletions

diff --git a/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch
deleted file mode 100644
index fd89af6c..00000000
--- a/recipes-kernel/linux/linux-intel/0001-6.10-vt-conmakehash-improve-reproducibility.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5635e0677692bc502588b09d04f138394e02669b Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Sun, 10 Jul 2022 21:37:07 -0400
-Subject: [PATCH] vt/conmakehash: improve reproducibility
-
-The file generated by conmakehash capture the application
-path used to generate the file. While that can be informative,
-it varies based on where the kernel was built, as the full
-path is captured.
-
-We tweak the application to use a second input as the "capture
-name", and then modify the Makefile to pass the basename of
-the source, making it reproducible.
-
-This could be improved by using some sort of path mapping,
-or the application manipualing argv[1] itself, but for now
-this solves the reprodicibility issue.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-
-Upstream-Status: Inappropriate
-
-Taken from linux-yocto, v5.15/standard/base
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- drivers/tty/vt/Makefile      | 2 +-
- drivers/tty/vt/conmakehash.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
-index 2c8ce8b592ed..8532077ed3bb 100644
---- a/drivers/tty/vt/Makefile
-+++ b/drivers/tty/vt/Makefile
-@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
- hostprogs += conmakehash
- 
- quiet_cmd_conmk = CONMK   $@
--      cmd_conmk = $(obj)/conmakehash $< > $@
-+      cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
- 
- $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
-        $(call cmd,conmk)
-diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
-index dc2177fec715..9df2198c459b 100644
---- a/drivers/tty/vt/conmakehash.c
-+++ b/drivers/tty/vt/conmakehash.c
-@@ -264,7 +264,7 @@ int main(int argc, char *argv[])
- #include <linux/types.h>\n\
- \n\
- u8 dfont_unicount[%d] = \n\
--{\n\t", rel_tblname, fontlen);
-+{\n\t", argv[2], fontlen);
- 
-   for ( i = 0 ; i < fontlen ; i++ )
-     {
--- 
-2.34.1
-
diff --git a/recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch
index df2a4139..df2a4139 100644
--- a/recipes-kernel/linux/linux-intel/0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch
+++ b/recipes-kernel/linux/linux-intel/0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch
diff --git a/recipes-kernel/linux/linux-intel_6.10.bb b/recipes-kernel/linux/linux-intel_6.11.bb
index c6e5cf1c..2e9c9d99 100644
--- a/recipes-kernel/linux/linux-intel_6.10.bb
+++ b/recipes-kernel/linux/linux-intel_6.11.bb
@@ -2,10 +2,9 @@ require linux-intel.inc
 
 SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
                   "
-SRC_URI:append = " file://0001-6.10-vt-conmakehash-improve-reproducibility.patch \
-                   file://0001-6.10-lib-build_OID_registry-fix-reproducibility-issues.patch \
+SRC_URI:append = " file://0001-6.11-lib-build_OID_registry-fix-reproducibility-issues.patch \
                   "
-KMETA_BRANCH = "yocto-6.10"
+KMETA_BRANCH = "master"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
@@ -13,13 +12,13 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 
 LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
 
-LINUX_VERSION ?= "6.10"
-SRCREV_machine ?= "37b6bf1243b894e0da6e640e589d479f3208f5ae"
-SRCREV_meta ?= "e4d2ade39f231ea279f19298c008ba48f4a202e5"
+LINUX_VERSION ?= "6.11"
+SRCREV_machine ?= "9a961f4b0a6a2655ef37e86b8588f2946b427650"
+SRCREV_meta ?= "5b42ba3f7fd0bb7b15d194871152f3b1a30f3926"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \
                             features/security/security.scc \
                             features/intel-npu/intel-npu.scc"
 
-UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.10-linux-(?P<pver>(\d+)T(\d+)Z)$"
+UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.11-linux-(?P<pver>(\d+)T(\d+)Z)$"