diff mbox series

[meta,scarthgap,05/07] linux-yocto/6.6: aufs: refresh to upstream aufs6.6.84

Message ID 20261029034503.3153661-6-bruce.ashfield@gmail.com
State New
Headers show
Series linux-yocto/6.6: -stable updates and aufs refresh | expand

Commit Message

Bruce Ashfield Oct. 29, 2026, 3:45 a.m. UTC 
From: Bruce Ashfield <bruce.ashfield@gmail.com>

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

1/4 [
    Author: Bruce Ashfield
    Email: bruce.ashfield@gmail.com
    Subject: aufs: update to upstream aufs6.6.84
    Date: Tue, 27 Oct 2026 12:19:23 -0400

    Refresh the in-tree aufs from the aufs6.5-era snapshot (6.5-20230918)
    to the current upstream aufs-standalone aufs6.6.84 snapshot
    (6.6.84-20250414, 31c39fd5). This moves v6.6 onto the native aufs6.6
    series, which handles the 6.6 VFS ctime accessors directly and already
    carries the allyesconfig build fixes in debug.c/sysrq.c, superseding
    our carried adaptations for those.

    aufs6.6.84 is the newest aufs6.6 point branch and targets the v6.6.84+
    stable API, matching linux-yocto's v6.6 stable base.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

2/4 [
    Author: Bruce Ashfield
    Email: bruce.ashfield@gmail.com
    Subject: aufs6: fix magic.mk include path
    Date: Thu, 6 Jul 2023 11:34:59 -0400

    commit 482d7131560c51da3ca [aufs stdalone: make it standalone] in the
    aufs upstream changes the way that the .mk file is included.

    This doesn't work properly with all kernel build processes, so we
    restore the use of srctree/src to locate the file.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
    (cherry picked from commit c4342d979bf213fcf2168f60c5f8fbdc76d1ac4d)
]

3/4 [
    Author: Bruce Ashfield
    Email: bruce.ashfield@gmail.com
    Subject: mm/mmap: aufs: drop prfile reference on remap_file_pages -EINTR path
    Date: Tue, 27 Oct 2026 12:19:34 -0400

    remap_file_pages() takes references on both vma->vm_file and the aufs
    vma->vm_prfile via vma_get_file(). Every exit path releases both, except
    the mmap_write_lock_killable() failure path, which only does fput(file)
    and leaks the vm_prfile reference whenever the mapping is backed by aufs.

    Release prfile there as well, matching the security_mmap_file() failure
    and normal exit paths (upstream aufs6.6.84 uses vma_fput(vma) on this
    path for the same reason).

    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

4/4 [
    Author: Bruce Ashfield
    Email: bruce.ashfield@gmail.com
    Subject: splice: aufs: drop stale do_splice_to() declaration
    Date: Tue, 27 Oct 2026 12:19:48 -0400

    The aufs6 base integration added an extern declaration for
    do_splice_to() to <linux/splice.h>. Upstream since folded do_splice_to()
    into vfs_splice_read(), so there is no longer any definition or user of
    it in the tree, leaving a dangling prototype. Upstream aufs6.6.84 dropped
    it from its base patch; drop it here too.

    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../linux/linux-yocto-rt_6.6.bb               |  4 ++--
 .../linux/linux-yocto-tiny_6.6.bb             |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_6.6.bb  | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)
diff mbox series

Patch

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 dbd7894eab..51a4e9703c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,8 +14,8 @@  python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "5d98280cab593fe037ee0dc56c451b48fa549507"
-SRCREV_meta ?= "d601e00cf0670dade657151698a6e1bfc431833e"
+SRCREV_machine ?= "bbef8f873c0872eaa717fb9b043b7b428de82c92"
+SRCREV_meta ?= "111e66d07f015c08755ae564c4a2f4a7710863ef"
 
 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 ba598063ef..14f0a62d79 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -17,8 +17,8 @@  DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "67b2cec31617d8d448fdb6b9786a0bf90bb49bcb"
-SRCREV_meta ?= "d601e00cf0670dade657151698a6e1bfc431833e"
+SRCREV_machine ?= "ada4ee01eb1897a0f2a46b9b3ceeb94690f9e619"
+SRCREV_meta ?= "111e66d07f015c08755ae564c4a2f4a7710863ef"
 
 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 ac5c593f1b..13fe981462 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,18 +18,18 @@  KBRANCH:qemux86-64 ?= "v6.6/standard/base"
 KBRANCH:qemuloongarch64  ?= "v6.6/standard/base"
 KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "6f024f9863d3f9bd5a3e40b24e65b355e0ff57f6"
-SRCREV_machine:qemuarm64 ?= "edbaaeea3aa5ea133a35962f75ba32fab5ffaa25"
-SRCREV_machine:qemuloongarch64 ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_machine:qemumips ?= "657fdce3e983f75a5a21e0399651a2bbdc034c12"
-SRCREV_machine:qemuppc ?= "75f8fea793b8611a220cfaba666a59a9aecc8f3c"
-SRCREV_machine:qemuriscv64 ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_machine:qemuriscv32 ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_machine:qemux86 ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_machine:qemux86-64 ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_machine:qemumips64 ?= "cfed5cc4b70b7c7d59f45b1bc8d58b4f4e4c1a95"
-SRCREV_machine ?= "8f55e2a3b837190130b37f52b906396739b6ac24"
-SRCREV_meta ?= "d601e00cf0670dade657151698a6e1bfc431833e"
+SRCREV_machine:qemuarm ?= "e67812bab0b383dea8ae786005a5ec642e6b860a"
+SRCREV_machine:qemuarm64 ?= "dce83a630a519666f8c5599478cd8db87cf772c2"
+SRCREV_machine:qemuloongarch64 ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_machine:qemumips ?= "e74bfb3fbb54e475fea2371332942c68ab7edc8e"
+SRCREV_machine:qemuppc ?= "a384bf5c01fda52c362015fb31815f41193f9e3b"
+SRCREV_machine:qemuriscv64 ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_machine:qemuriscv32 ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_machine:qemux86 ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_machine:qemux86-64 ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_machine:qemumips64 ?= "14d15eae8d97e33895da68333b4347af334e5c65"
+SRCREV_machine ?= "0615dc1f6a56bbd35510d527380a9e899adf8707"
+SRCREV_meta ?= "111e66d07f015c08755ae564c4a2f4a7710863ef"
 
 # 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