34 files changed, 371 insertions, 576 deletions
diff --git a/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch b/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch
deleted file mode 100644
index 353126fe..00000000
--- a/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3fcc81ad127c267018aed96a359bbf01db1bd8ee Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Sat, 1 Apr 2017 11:43:31 -0700
-Subject: [PATCH] zc: Force 4.10 get_user_pages_remote API
-This change forces the newer API, as the linux-intel 4.9-LTS kernel
-backported the 4.10 API change in the page handling code.
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- zc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/zc.c b/zc.c
-index ae464ff..b2759ce 100644
--- a/zc.c
-+++ b/zc.c
-@@ -65,7 +65,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
- #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0))
-        ret = get_user_pages_remote(task, mm,
-                        (unsigned long)addr, pgcount, write, 0, pg, NULL);
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0))
-+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) & 0)
-        ret = get_user_pages_remote(task, mm,
-                        (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
-                        pg, NULL);
diff --git a/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
deleted file mode 100644
index c59ddb2f..00000000
--- a/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-python() {
-    # When we add more kernels for linux-intel, we may have to add a Version check
-    if (d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel"):
-        src_uri = d.getVar("SRC_URI")
-        d.setVar("SRC_URI", src_uri +
-             " file://0001-zc-Force-4.10-get_user_pages_remote-API.patch")
-}
diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch
deleted file mode 100644
index 0041af57..00000000
--- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5f87ef7ed60bc9762467184ed0a6d000b80713d9 Mon Sep 17 00:00:00 2001
-From: sweeaun <swee.aun.khor@intel.com>
-Date: Sun, 8 Apr 2018 17:21:52 +0800
-Subject: [PATCH] ixgbe: skip host depmod
-Upstream-Status: Inappropriate [Cross-Compile]
-Depmod during do_install is irrelevant when cross-compiling.
-Remove the depmod steps during do_install.
-Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/Makefile b/Makefile
-index 545489a..07e422f 100644
--- a/Makefile
-+++ b/Makefile
-@@ -141,8 +141,6 @@ install: default manfile
-        @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz
-        @echo "Installing modules..."
-        @+$(call devkernelbuild,modules_install)
-       @echo "Running depmod..."
-       @$(call cmd_depmod)
- 
- uninstall:
-        rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko;
-- 
-2.7.4
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
new file mode 100644
index 00000000..696c5c26
--- /dev/null
+++ b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb
@@ -0,0 +1,43 @@
+SUMMARY = "ixgbe kernel driver for Intel Magnolia Park 10GbE"
+DESCRIPTION = "The ixgbe driver supports 82598- and 82599-based \
+PCI Express* 10 Gigabit Network Connections."
+HOMEPAGE = "https://sourceforge.net/projects/e1000/"
+SECTION = "kernel/network"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
+SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
+           "
+SRC_URI[sha256sum] = "da7e7b62ffb85a820d7541623fbef5c4abef8d1df7ac0af3f1acc3b3d76c9822"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/"
+UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"
+CVE_PRODUCT = "linux:linux_kernel_ixgbe"
+S = "${WORKDIR}/${BP}/src"
+EXTRA_OEMAKE = ' KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
+KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe"
+KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe"
+inherit module
+do_install:append () {
+        # Install scripts/set_irq_affinity
+        install -d      ${D}${sysconfdir}/network
+        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
+        rm -rf ${D}${prefix}/man
+}
+PACKAGES += "${PN}-script"
+FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+EXCLUDE_FROM_WORLD = "1"
+CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1"
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.3.7.bb b/recipes-kernel/intel-ethernet/ixgbe_5.3.7.bb
deleted file mode 100644
index 58e3829f..00000000
--- a/recipes-kernel/intel-ethernet/ixgbe_5.3.7.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE"
-DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \
-PCI Express* 10 Gigabit Network Connections."
-HOMEPAGE = "https://sourceforge.net/projects/e1000/"
-SECTION = "kernel/network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
-           file://0001-ixgbe-skip-host-depmod.patch \
-           "
-SRC_URI[md5sum] = "7d02dd0173bc8a2a043b0c87817d6c37"
-SRC_URI[sha256sum] = "1a38ae395f18cd4ce3c57f17beb22282171196115baa744b3a53cb7a80ead32b"
-S = "${WORKDIR}/${BP}/src"
-MODULES_INSTALL_TARGET = "install"
-EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
-KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbe"
-KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe"
-inherit module
-do_install_append () {
-        # Install scripts/set_irq_affinity
-        install -d      ${D}${sysconfdir}/network
-        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
-        rm -rf ${D}${prefix}/man
-}
-PACKAGES += "${PN}-script"
-FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch
deleted file mode 100644
index 49a59496..00000000
--- a/recipes-kernel/intel-ethernet/ixgbevf/0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b1d7f46442e50458311573443a5c78637874f62b Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 12 Apr 2018 11:46:15 +0800
-Subject: [PATCH] Makefile: check for CONFIG_IXGBEVF instead
-Check for the correct config, otherwise it won't build with kbuild.
-Upstream-Status: Pending
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Makefile b/Makefile
-index 968ef5e..e3cb81b 100644
--- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@ ifneq ($(KERNELRELEASE),)
- # Makefile for the Intel(R) 10GbE PCI Express Virtual Function Driver
- #
- 
-obj-$(CONFIG_IXGBE) += ixgbevf.o
-+obj-$(CONFIG_IXGBEVF) += ixgbevf.o
- 
- define ixgbevf-y
-        ixgbevf_main.o
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch
deleted file mode 100644
index 656a897d..00000000
--- a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001
-From: sweeaun <swee.aun.khor@intel.com>
-Date: Sat, 7 Oct 2017 20:56:35 -0700
-Subject: [PATCH] ixgbevf: skip host depmod
-Upstream-Status: Inappropriate [Cross-Compile]
-Depmod during do_install is irrelevant when cross-compiling.
-Remove the depmod steps during do_install.
-Signed-off-by: sweeaun <swee.aun.khor@intel.com>
---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/Makefile b/Makefile
-index 91df705..1dcf350 100644
--- a/Makefile
-+++ b/Makefile
-@@ -104,8 +104,6 @@ modules_install: default manfile
-        @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz
-        @echo "Installing modules..."
-        @+$(call kernelbuild,modules_install)
-       @echo "Running depmod..."
-       @$(call cmd_depmod)
- 
- uninstall:
-        rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko;
-- 
-2.7.4
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
new file mode 100644
index 00000000..92e25739
--- /dev/null
+++ b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb
@@ -0,0 +1,46 @@
+SUMMARY = "ixgbevf kernel driver for Intel Magnolia Park 10GbE"
+DESCRIPTION = "This virtual function driver supports kernel versions 2.6.x and newer \
+This driver supports 82599, X540, X550, and X552-based virtual function devices \
+that can only be activated on kernels that support SR-IOV. \
+SR-IOV requires the correct platform and OS support. \
+The guest OS loading this driver must support MSI-X interrupts."
+HOMEPAGE = "https://sourceforge.net/projects/e1000/"
+SECTION = "kernel/network"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417"
+SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
+           "
+SRC_URI[sha256sum] = "73c6a27be324a48b069dbda0d1d07212a2214c71f54df57bca7177fc92b04881"
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
+UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"
+CVE_PRODUCT = "linux:linux_kernel_ixgbe"
+S = "${WORKDIR}/${BP}/src"
+EXTRA_OEMAKE = 'KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
+KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf"
+KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf"
+inherit module
+do_install:append () {
+        # Install scripts/set_irq_affinity
+        install -d      ${D}${sysconfdir}/network
+        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
+        rm -rf ${D}${prefix}/man
+}
+PACKAGES += "${PN}-script"
+FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1"
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.3.5.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.3.5.bb
deleted file mode 100644
index 6f1ca081..00000000
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.3.5.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY="ixgbevf kernel driver for Intel Magnolia Park 10GbE"
-DESCRIPTION="This virtual function driver supports kernel versions 2.6.x and newer \
-This driver supports 82599, X540, X550, and X552-based virtual function devices \
-that can only be activated on kernels that support SR-IOV. \
-SR-IOV requires the correct platform and OS support. \
-The guest OS loading this driver must support MSI-X interrupts."
-HOMEPAGE = "https://sourceforge.net/projects/e1000/"
-SECTION = "kernel/network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
-           file://0001-ixgbevf-skip-host-depmod.patch \
-           file://0001-Makefile-check-for-CONFIG_IXGBEVF-instead.patch \
-           "
-SRC_URI[md5sum] = "cdd9c52f034223c114d4b10345d11fe9"
-SRC_URI[sha256sum] = "f2ae017462bd1ea8082710580ec3dadfc322a0b2ecd4a576a16f0a4b622e5968"
-S = "${WORKDIR}/${BP}/src"
-MODULES_INSTALL_TARGET = "install"
-EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"'
-KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf"
-KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf"
-inherit module
-do_install_append () {
-        # Install scripts/set_irq_affinity
-        install -d      ${D}${sysconfdir}/network
-        install -m 0755 ${S}/../scripts/set_irq_affinity  ${D}${sysconfdir}/network
-        rm -rf ${D}${prefix}/man
-}
-PACKAGES += "${PN}-script"
-FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch
deleted file mode 100644
index 4fdc36f7..00000000
--- a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ecb29b78ce946c802058be0c46a0d20432f412e5 Mon Sep 17 00:00:00 2001
-From: Saul Wold <sgw@linux.intel.com>
-Date: Thu, 28 Sep 2017 10:51:15 -0700
-Subject: [PATCH] hrtimer: fix version numbers because production kernel has
- update
-Decrease the version check because the OTC production kernel which is
-4.9 includes the HRTimer code that this is using.
-Upstream-Status: [Backport] It's been backported into the older kernel
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
- backport-include/linux/hrtimer.h                        | 2 +-
- drivers/net/wireless/intel/iwlwifi/mvm/tx.c             | 2 +-
- drivers/net/wireless/intel/iwlwifi/pcie/tx.c            | 2 +-
- drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | 2 +-
- net/mac80211/tx.c                                       | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/backport-include/linux/hrtimer.h b/backport-include/linux/hrtimer.h
-index bdcf106e1..ae128852d 100644
--- a/backport-include/linux/hrtimer.h
-+++ b/backport-include/linux/hrtimer.h
-@@ -4,7 +4,7 @@
- #include_next <linux/hrtimer.h>
- #include <linux/interrupt.h>
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
- static inline void backport_hrtimer_start(struct hrtimer *timer, s64 time,
-                                          const enum hrtimer_mode mode)
- {
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-index cf1f95a01..e6f1ff294 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-@@ -1310,7 +1310,7 @@ static void iwl_mvm_tx_lat_add_ts_ack(struct sk_buff *skb)
-        s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32;
-        s64 diff = temp - ts_1;
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += diff;
- #else
-        skb->tstamp += diff;
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-index df81bce25..ad664bacd 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
-@@ -1955,7 +1955,7 @@ static void iwl_trans_pci_tx_lat_add_ts_write(struct sk_buff *skb)
-        s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32;
-        s64 diff = temp - ts_1;
- 
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += diff << 16;
- #else
-        skb->tstamp += diff << 16;
-diff --git a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-index e4d45bcf7..cdd0ba9a2 100644
--- a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-+++ b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c
-@@ -796,7 +796,7 @@ void iwl_slv_tx_lat_add_ts_write(struct iwl_trans_slv *trans_slv,
- 
-        ts_1 = ktime_to_ns(data_entry->skb->tstamp) >> 32;
-        diff = temp - ts_1;
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        data_entry->skb->tstamp.tv64 += diff << 16;
- #else
-        data_entry->skb->tstamp += diff << 16;
-diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
-index 94a348688..0f226c413 100644
--- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -2278,7 +2278,7 @@ static void ieee80211_tx_latency_start_msrmnt(struct ieee80211_local *local,
-        if (!tx_latency && !tx_consec && !tx_thrshld)
-                return;
-        temp = ktime_to_ms(ktime_get());
-#if LINUX_VERSION_IS_LESS(4,10,0)
-+#if LINUX_VERSION_IS_LESS(4,9,0)
-        skb->tstamp.tv64 += temp << 32;
- #else
-        skb->tstamp += temp << 32;
-- 
-2.13.5
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
index 0173ef83..7aaf22c2 100644
--- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
+++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb
@@ -1,13 +1,13 @@
 SUMMARY = "Intel Wireless LinuxCore kernel driver"
 DESCRIPTION = "Intel Wireless LinuxCore kernel driver"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 REQUIRED_DISTRO_FEATURES = "wifi"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-inherit module
+inherit module features_check
 # For some iwfwifi LinuxCore supported wireless chips, the best/latest
 # firmware blobs are found in the iwlwifi's linux-firmware.git fork.
@@ -17,16 +17,12 @@ inherit module
 # When updating this recipe, ensure that the proper firmware is included from
 # either the linux-firmware or iwlwifi-firmware repos.
-PV = "30"
+PV = "79"
-SRCREV = "b31221a99488021300e7f89d2ecf9bdd2bc52dd2"
+SRCREV = "574631d89d736fd2c76b0e2ea489270c50903e52"
-# Add a patch for Intel's Production Kernel as it's got a backport of HRTimers
-PK_PATCH = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel','linux-intel','file://0001-hrtimer-fix-version-numbers-because-production-kerne.patch','',d)}"
 SRC_URI = " \
-           git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV} \
+           git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \
           file://0001-Makefile.real-skip-host-install-scripts.patch \
-           ${PK_PATCH} \
           file://iwlwifi.conf \
          "
@@ -38,17 +34,21 @@ do_configure() {
        CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT}
 }
-MODULES_INSTALL_TARGET="install"
+MODULES_INSTALL_TARGET = "install"
-do_install_append() {
+do_install:append() {
        ## install configs and service scripts
        install -d ${D}${sysconfdir}/modprobe.d
        install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d
 }
-RDEPENDS_${PN} = "linux-firmware-iwlwifi"
+RDEPENDS:${PN} = "linux-firmware-iwlwifi"
+FILES:${PN} += "${sysconfdir}/modprobe.d/iwlwifi.conf"
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi"
 KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi"
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb
deleted file mode 100644
index 2af2ab35..00000000
--- a/recipes-kernel/linux/linux-intel-rt_4.14.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require linux-intel.inc
-# Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
-# to build multiple virtual/kernel providers, e.g. as dependency of
-# core-image-rt-sdk, core-image-rt.
-python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
-        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
-}
-KBRANCH = "4.14/preempt-rt"
-KMETA_BRANCH = "yocto-4.14"
-# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
-SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
-DEPENDS += "elfutils-native openssl-native util-linux-native"
-LINUX_VERSION ?= "4.14.59"
-SRCREV_machine ?= "6a0fa58d9e8c74b7a3884834d3196b19b42db194"
-SRCREV_meta ?= "5c089e91b398ac284f027a4611979136becbf9b1"
-LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel-rt_4.9.bb b/recipes-kernel/linux/linux-intel-rt_4.9.bb
deleted file mode 100644
index 0b81987a..00000000
--- a/recipes-kernel/linux/linux-intel-rt_4.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require linux-intel.inc
-# Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
-# to build multiple virtual/kernel providers, e.g. as dependency of
-# core-image-rt-sdk, core-image-rt.
-python () {
-    if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
-        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
-}
-KBRANCH = "4.9/yocto/base-rt"
-KMETA_BRANCH = "yocto-4.9"
-LINUX_VERSION ?= "4.9.84"
-SRCREV_machine ?= "33b17c3a62dc470c849f85ce2a90cfa90e96bcf5"
-SRCREV_meta ?= "bae5cc4e973f60baa35ed227ba0c3bdda4d16e87"
-LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel-rt_6.12.bb b/recipes-kernel/linux/linux-intel-rt_6.12.bb
new file mode 100644
index 00000000..13b495d1
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel-rt_6.12.bb
@@ -0,0 +1,35 @@
+require linux-intel.inc
+SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
+                    "
+SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \
+                  "
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+    if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt":
+        raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it")
+}
+KBRANCH = "6.12/linux"
+KMETA_BRANCH = "yocto-6.12"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
+LINUX_VERSION ?= "6.12.27"
+SRCREV_machine ?= "9e2f92c31c6353101755c83670232c94e0c07ddc"
+SRCREV_meta ?= "da71eb19ceab34a7a6ff4284f1580e043c870168"
+LINUX_KERNEL_TYPE = "preempt-rt"
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 2525c70d..c698ae28 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -1,26 +1,22 @@
 require recipes-kernel/linux/linux-yocto.inc
 require recipes-kernel/linux/meta-intel-compat-kernel.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:"
-KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}"
+KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}"
 SRC_URI = " \
-           git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
-           file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
           ${KERNEL_CONFIG_URI} \
+           file://fix-perf-reproducibility.patch \
+           file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+           file://0002-mconf-fix-output-of-cflags-and-libraries.patch \
          "
-SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
-LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
+KCONF_BSP_AUDIT_LEVEL = "0"
-COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)"
+COMPATIBLE_MACHINE ?= "(intel-corei7-64)"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch b/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch
new file mode 100644
index 00000000..df2a4139
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -0,0 +1,48 @@
+From 4881d0f985aab70c685bd63b56a2d6ad5e790abc Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 22:56:53 -0400
+Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
+The script build_OID_registry captures the full path of itself
+in the generated data. This causes reproduciblity issues as the
+path is captured and packaged.
+We use the basename of the script instead, and that allows us
+to be reprodicible, with slightly less information captured in
+the output data (but the generating script can still easily
+be found).
+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>
+---
+ lib/build_OID_registry | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index 8267e8d71338..755dd33a8b04 100755
+--- a/lib/build_OID_registry
+++ b/lib/build_OID_registry
+@@ -9,6 +9,7 @@
+ 
+ use strict;
+ use Cwd qw(abs_path);
+use File::Basename;
+ 
+ my @names = ();
+ my @oids = ();
+@@ -40,7 +41,7 @@ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+ my $scriptname = $0;
+ $scriptname =~ s#^\Q$abs_srctree/\E##;
+-print C_FILE " * Automatically generated by ", $scriptname, ".  Do not edit\n";
+print C_FILE " * Automatically generated by ", basename $0, ".  Do not edit\n";
+ print C_FILE " */\n";
+ 
+ #
+-- 
+2.34.1
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
deleted file mode 100644
index a9e9213b..00000000
--- a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001
-From: Jason Wessel <jason.wessel@windriver.com>
-Date: Thu, 25 Sep 2014 11:26:49 -0700
-Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses
- location
-In some cross build environments such as the Yocto Project build
-environment it provides an ncurses library that is compiled
-differently than the host's version.  This causes display corruption
-problems when the host's curses includes are used instead of the
-includes from the provided compiler are overridden.  There is a second
-case where there is no curses libraries at all on the host system and
-menuconfig will just fail entirely.
-The solution is simply to allow an override variable in
-check-lxdialog.sh for environments such as the Yocto Project.  Adding
-a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
-compiling and linking against the right headers and libraries.
-Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103]
-Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-cc: Michal Marek <mmarek@suse.cz>
-cc: linux-kbuild@vger.kernel.org
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
- scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++
- 1 file changed, 8 insertions(+)
- mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh
-diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
-old mode 100755
-new mode 100644
-index 5075ebf2d3b9..ba9242101190
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
-+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
-@@ -4,6 +4,10 @@
- # What library to link
- ldflags()
- {
-+       if [ "$CROSS_CURSES_LIB" != "" ]; then
-+               echo "$CROSS_CURSES_LIB"
-+               exit
-+       fi
-        pkg-config --libs ncursesw 2>/dev/null && exit
-        pkg-config --libs ncurses 2>/dev/null && exit
-        for ext in so a dll.a dylib ; do
-@@ -21,6 +25,10 @@ ldflags()
- # Where is ncurses.h?
- ccflags()
- {
-+       if [ x"$CROSS_CURSES_INC" != x ]; then
-+               echo "$CROSS_CURSES_INC"
-+               exit
-+       fi
-        if pkg-config --cflags ncursesw 2>/dev/null; then
-                echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
-        elif pkg-config --cflags ncurses 2>/dev/null; then
-- 
-2.14.3
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
new file mode 100644
index 00000000..a601e783
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -0,0 +1,52 @@
+From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses
+ location
+In some cross build environments such as the Yocto Project build
+environment it provides an ncurses library that is compiled
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+Upstream-Status: Submitted
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 1e61f50a5905..38cf8304bb31 100755
+--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
+@@ -7,6 +7,14 @@ libs=$2
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
+if [ "$CROSS_CURSES_LIB" != "" ]; then
+    echo libs=\'$CROSS_CURSES_LIB\'
+    if [ x"$CROSS_CURSES_INC" != x ]; then
+       echo cflags=\'$CROSS_CURSES_INC\'
+    fi
+    exit 0
+fi
+
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+        if ${HOSTPKG_CONFIG} --exists $PKG; then
+                ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+-- 
+2.34.1
diff --git a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch b/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch
deleted file mode 100644
index 5c8b27c7..00000000
--- a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 57af599929263e7bb6f2f369c9e4bc1e440528a9 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 21 Aug 2017 13:52:53 -0400
-Subject: [PATCH 1/1] perf: x86-32: explicitly include <errno.h>
-Upstream-Status: submitted
-The 32bit x86 perf build does not find the system definitions of error
-return values, hence we end up with:
-| In file included from util/libunwind/x86_32.c:32:0:
-| util/libunwind/../../arch/x86/util/unwind-libunwind.c: In function 'libunwind__x86_reg_id':
-| util/libunwind/../../arch/x86/util/unwind-libunwind.c:109:11: error: 'EINVAL' undeclared (first use in this function); did you mean 'UNW_EINVAL'?
-|    return -EINVAL;
-|            ^~~~~~
-|            UNW_EINVAL
-By explicitly including errno.h, we can fix this build without impacting
-other architectures.
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
- tools/perf/util/libunwind/x86_32.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/tools/perf/util/libunwind/x86_32.c b/tools/perf/util/libunwind/x86_32.c
-index 957ffff72428..d781f7bdeb88 100644
--- a/tools/perf/util/libunwind/x86_32.c
-+++ b/tools/perf/util/libunwind/x86_32.c
-@@ -20,6 +20,7 @@
- #define LIBUNWIND__ARCH_REG_IP PERF_REG_X86_IP
- #define LIBUNWIND__ARCH_REG_SP PERF_REG_X86_SP
- 
-+#include <errno.h>
- #include "unwind.h"
- #include "debug.h"
- #include "libunwind-x86.h"
-- 
-2.14.3
diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch
new file mode 100644
index 00000000..a96b68d9
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch
@@ -0,0 +1,40 @@
+From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 17 Jul 2023 17:17:55 -0400
+Subject: [PATCH 2/2] mconf: fix output of cflags and libraries
+commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce
+process forks] changes the way that flags are detected. They are
+no longer just echo'd and captured, they are written to a file and
+later read.
+We adjust our CROSS ncurses patch accordingly.
+We'll eventually be able to drop this patch, but not quite yet.
+Upstream-Status: Inappropriate  [OE-Specific]
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 38cf8304bb31..a5ae56e08b07 100755
+--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
+@@ -8,9 +8,9 @@ PKG="ncursesw"
+ PKG2="ncurses"
+ 
+ if [ "$CROSS_CURSES_LIB" != "" ]; then
+-    echo libs=\'$CROSS_CURSES_LIB\'
+    echo $CROSS_CURSES_LIB > ${libs}
+     if [ x"$CROSS_CURSES_INC" != x ]; then
+-       echo cflags=\'$CROSS_CURSES_INC\'
+       echo $CROSS_CURSES_INC > ${cflags}
+     fi
+     exit 0
+ fi
+-- 
+2.34.1
diff --git a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
deleted file mode 100644
index b38cf6c2..00000000
--- a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
-# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
-# CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set
-# CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set
diff --git a/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch
new file mode 100644
index 00000000..1a98b1db
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch
@@ -0,0 +1,39 @@
+From b8cd0e429bf75b673c438a8277d4bc74327df992 Mon Sep 17 00:00:00 2001
+From: Tom Zanussi <tom.zanussi@intel.com>
+Date: Tue, 3 Jul 2012 13:07:23 -0500
+Subject: perf: change --root to --prefix for python install
+Otherwise we get the sysroot path appended to the build path, not what
+we want.
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+Upstream-Status: Inappropriate
+Taken from linux-yocto, v5.15/standard/base
+https://git.yoctoproject.org/linux-yocto/commit?id=b8cd0e429bf75b673c438a8277d4bc74327df992&h=v5.15%2Fstandard%2Fbase
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ tools/perf/Makefile.perf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+(limited to 'tools/perf/Makefile.perf')
+diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
+index 8f738e11356d..ee945d8e3996 100644
+--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
+@@ -1022,7 +1022,7 @@ install-bin: install-tools install-tests install-traceevent-plugins
+ install: install-bin try-install-man
+ 
+ install-python_ext:
+-       $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
+       $(PYTHON_WORD) util/setup.py --quiet install --prefix='$(DESTDIR_SQ)/usr'
+ 
+ # 'make install-doc' should call 'make -C Documentation install'
+ $(INSTALL_DOC_TARGETS):
+-- 
+cgit 
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb
deleted file mode 100644
index d9bb1222..00000000
--- a/recipes-kernel/linux/linux-intel_4.14.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require linux-intel.inc
-KBRANCH = "4.14/base"
-KMETA_BRANCH = "yocto-4.14"
-# Fix for 32-bit perf issue. Remove when patch is backported to 4.14.
-SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch"
-DEPENDS += "elfutils-native openssl-native util-linux-native"
-LINUX_VERSION ?= "4.14.68"
-SRCREV_machine ?= "6a22f4848396c544f862f5a4b20e32f0ce106078"
-SRCREV_meta ?= "0936b18ed8d58257f8f1d79c085adbf6d4362530"
-# For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb
deleted file mode 100644
index 32f2949f..00000000
--- a/recipes-kernel/linux/linux-intel_4.9.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require linux-intel.inc
-KBRANCH = "4.9/yocto/base"
-KMETA_BRANCH = "yocto-4.9"
-LINUX_VERSION ?= "4.9.126"
-SRCREV_machine ?= "38d41ee6fde529a3c8e98a0134411e6f0067e0ad"
-SRCREV_meta ?= "f9e90afd4e47920e990dacb73cd6508917ca5422"
-# For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb
new file mode 100644
index 00000000..32b0b2e4
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel_6.12.bb
@@ -0,0 +1,25 @@
+require linux-intel.inc
+SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
+                    "
+SRC_URI:append = " file://0001-6.12-lib-build_OID_registry-fix-reproducibility-issues.patch \
+                  "
+KBRANCH = "6.12/linux"
+KMETA_BRANCH = "yocto-6.12"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+DEPENDS += "elfutils-native openssl-native util-linux-native"
+LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
+LINUX_VERSION ?= "6.12.27"
+SRCREV_machine ?= "9e2f92c31c6353101755c83670232c94e0c07ddc"
+SRCREV_meta ?= "da71eb19ceab34a7a6ff4284f1580e043c870168"
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \
+                            features/security/security.scc \
+                            features/intel-npu/intel-npu.scc"
+UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index 6173148c..deb19940 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,21 +1,21 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
+COMPATIBLE_MACHINE:core2-32-intel-common = "${MACHINE}"
-KMACHINE_core2-32-intel-common = "intel-core2-32"
+KMACHINE:core2-32-intel-common = "intel-core2-32"
-KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:append:core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
+COMPATIBLE_MACHINE:corei7-64-intel-common = "${MACHINE}"
-KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KMACHINE:corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:append:corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
 # and setting them here breaks the default mechanism to use AUTOREV if the
 # default SRCREV is set and linux-yocto-dev is the preferred provider.
 # For Crystalforest and Romley
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio"
 # For FRI2, NUC
-KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi"
-KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"
+KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi"
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.14.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
index daa7dd6b..daa7dd6b 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.18.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.18.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto-rt_4.18.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index 7c29be14..9f3d43e3 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,4 +1,6 @@
+require meta-intel-compat-kernel.inc
 # The kernel build is 64-bit regardless, so include both common overrides.
 # Without this, the kernel will be missing vars that make it buildable for the
 # intel-corei7-64 machine.
-MACHINEOVERRIDES_prepend_corei7-64-x32-intel-common = "corei7-64-intel-common:"
+MACHINEOVERRIDES:prepend:corei7-64-x32-intel-common = "corei7-64-intel-common:"
diff --git a/recipes-kernel/linux/linux-yocto_4.14.bbappend b/recipes-kernel/linux/linux-yocto_4.14.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto_4.14.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/linux-yocto_4.18.bbappend b/recipes-kernel/linux/linux-yocto_4.18.bbappend
deleted file mode 100644
index daa7dd6b..00000000
--- a/recipes-kernel/linux/linux-yocto_4.18.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require meta-intel-compat-kernel.inc
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc
index be5056c2..0c861e13 100644
--- a/recipes-kernel/linux/meta-intel-compat-kernel.inc
+++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc
@@ -3,11 +3,12 @@
 KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
+COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}"
-KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KMACHINE:corei7-64-intel-common = "intel-corei7-64"
-KMACHINE_core2-32-intel-common = "intel-core2-32"
+KMACHINE:core2-32-intel-common = "intel-core2-32"
+KMACHINE:x86-64-v3-intel-common = "intel-corei7-64"
 INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915"
-KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"
+KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"
diff --git a/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch b/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch
deleted file mode 100644
index 32b49b8d..00000000
--- a/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ebfdc8b8af17f9cf23c6878eb52476fde7b48e5c Mon Sep 17 00:00:00 2001
-From: Priyalee Kushwaha <priyalee.kushwaha@intel.com>
-Date: Fri, 22 Sep 2017 14:40:57 -0700
-Subject: [PATCH] lttng-modules: PKT 4.9 yocto build failed
-PKT 4.9 yocto kernel backports a patch from upstream and that
-changes header include/linux/ktimer.h. Since this backported
-patch is only relevant for PKT kernel, we need to carry this
-patch.
-Upstream-Status: Backport
-Signed-off-by: Kushwaha, Priyalee <priyalee.kushwaha@intel.com>
---
- instrumentation/events/lttng-module/timer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
-index d62fd25..59da988 100644
--- a/instrumentation/events/lttng-module/timer.h
-+++ b/instrumentation/events/lttng-module/timer.h
-@@ -16,11 +16,11 @@ struct timer_list;
- 
- #endif /* _TRACE_TIMER_DEF_ */
- 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0))
- #define lttng_ktime_get_tv64(kt)       (kt)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */
- #define lttng_ktime_get_tv64(kt)       ((kt).tv64)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */
- 
- LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
- 
-- 
-2.7.4
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend
deleted file mode 100644
index dc1c4a74..00000000
--- a/recipes-kernel/lttng/lttng-modules_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
-LTTNG_PATCH = "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/kernel','linux-intel linux-intel-rt','file://0002-lttng-modules-PKT-4.9-yocto-build-failed.patch','',d)}"
-SRC_URI_append_intel-x86-common = " ${LTTNG_PATCH}"