[meta][PATCH 07/07] linux-yocto/6.18: mtd: use refcount to prevent corruption

[bruce.ashfield@gmail.com]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

1/1 [
    Author: Liwei Song
    Email: liwei.song@windriver.com
    Subject: Revert "mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, release} to avoid race condition"
    Date: Wed, 24 Dec 2025 15:32:34 +0800

    This reverts commit 957b188b585a4f1f9f3a39198b06a6fd62d6827d.

    The issue that this patch is trying to resolve has been fixed by
    upstream commit 19bfa9ebebb5 ("mtd: use refcount to prevent corruption")
    so this local patch can be reverted, if not, it will cause an unbalanced
    refcnt issue when open/close mtd device.

    Signed-off-by: Liwei Song <liwei.song@windriver.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../linux/linux-yocto-rt_6.18.bb               |  2 +-
 .../linux/linux-yocto-tiny_6.18.bb             |  2 +-
 meta/recipes-kernel/linux/linux-yocto_6.18.bb  | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.18.bb
index 52ecbb4731..e078abb2e7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.18.bb
@@ -14,7 +14,7 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "3587d6639806e9f37471f7fd1842856f67aadb73"
+SRCREV_machine ?= "cae06a38afe2ab47233686af4b49affd31977a9e"
 SRCREV_meta ?= "83fff3acfc84814b4da0cdb2a63d608d376c3cdd"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.18.bb
index 4038fc2ebc..be8883a23c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.18.bb
@@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "841ef97434365625fc8fc51fc50606de61f9f838"
+SRCREV_machine ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
 SRCREV_meta ?= "83fff3acfc84814b4da0cdb2a63d608d376c3cdd"
 
 PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.18.bb b/meta/recipes-kernel/linux/linux-yocto_6.18.bb
index 89631e3332..1421587600 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.18.bb
@@ -18,17 +18,17 @@ KBRANCH:qemux86-64 ?= "v6.18/standard/base"
 KBRANCH:qemuloongarch64  ?= "v6.18/standard/base"
 KBRANCH:qemumips64 ?= "v6.18/standard/mti-malta"
 
-SRCREV_machine:qemuarm ?= "6d340e3238d68fe8e942f44f322178a9cdfa9798"
-SRCREV_machine:qemuarm64 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
-SRCREV_machine:qemuloongarch64 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
+SRCREV_machine:qemuarm ?= "8cc1dbeb4d9adb5358188cac4e3435edd2c45a58"
+SRCREV_machine:qemuarm64 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
+SRCREV_machine:qemuloongarch64 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
 SRCREV_machine:qemumips ?= "62ea92a539f58803a222be98b81118403074206e"
-SRCREV_machine:qemuppc ?= "841ef97434365625fc8fc51fc50606de61f9f838"
-SRCREV_machine:qemuriscv64 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
-SRCREV_machine:qemuriscv32 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
-SRCREV_machine:qemux86 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
-SRCREV_machine:qemux86-64 ?= "841ef97434365625fc8fc51fc50606de61f9f838"
+SRCREV_machine:qemuppc ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
+SRCREV_machine:qemuriscv64 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
+SRCREV_machine:qemuriscv32 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
+SRCREV_machine:qemux86 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
+SRCREV_machine:qemux86-64 ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
 SRCREV_machine:qemumips64 ?= "9fb4ff0187c85426f21fd40d4c61b742800f65c4"
-SRCREV_machine ?= "841ef97434365625fc8fc51fc50606de61f9f838"
+SRCREV_machine ?= "f7430dca0cf7d678fdc441f1653b519588861e2e"
 SRCREV_meta ?= "83fff3acfc84814b4da0cdb2a63d608d376c3cdd"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
-- 
2.39.2