[packages/kernel] Up to 6.16.0
arekm
arekm at pld-linux.org
Thu Jul 31 18:39:01 CEST 2025
commit adfa13391d26805c1ebf581396e69b8c97a81aab
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Jul 31 18:38:49 2025 +0200
Up to 6.16.0
android-enable-building-binder-as-module.patch | 24 +-
kernel-aufs.patch | 375 ++++++++++++-------------
kernel-multiarch.config | 240 +++++++++++-----
kernel-x86.config | 29 +-
kernel.spec | 6 +-
update-source.sh | 4 +-
6 files changed, 375 insertions(+), 303 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a3fc2148..9701e391 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -52,8 +52,8 @@
%endif
%define rel 1
-%define basever 6.15
-%define postver .8
+%define basever 6.16
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -104,7 +104,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
-# Source0-md5: c0f205cc27982a875c519f644a6288c4
+# Source0-md5: dd850269c3f456c0ff5518b1a2a81836
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
# Patch0-md5: 629d2999fa35b651dd3e563b0e771001
diff --git a/android-enable-building-binder-as-module.patch b/android-enable-building-binder-as-module.patch
index 14fcec72..9b97b648 100644
--- a/android-enable-building-binder-as-module.patch
+++ b/android-enable-building-binder-as-module.patch
@@ -129,24 +129,14 @@
struct msg_msgseg *next;
--- linux-6.3/mm/memory.c.orig 2023-04-23 21:02:52.000000000 +0200
+++ linux-6.3/mm/memory.c 2023-04-26 10:57:23.873394940 +0200
-@@ -1728,6 +1728,7 @@
+@@ -2050,6 +2050,7 @@ void zap_page_range_single(struct vm_are
+ zap_page_range_single_batched(&tlb, vma, address, size, details);
tlb_finish_mmu(&tlb);
- hugetlb_zap_end(vma, details);
}
+EXPORT_SYMBOL_GPL(zap_page_range_single);
/**
* zap_vma_ptes - remove ptes mapping the vma
---- linux-6.14/mm/memory.c.orig 2025-04-04 12:37:07.313526117 +0200
-+++ linux-6.14/mm/memory.c 2025-04-04 15:02:23.096531325 +0200
-@@ -6395,6 +6395,7 @@
- count_vm_vma_lock_event(VMA_LOCK_ABORT);
- return NULL;
- }
-+EXPORT_SYMBOL_GPL(lock_vma_under_rcu);
- #endif /* CONFIG_PER_VMA_LOCK */
-
- #ifndef __PAGETABLE_P4D_FOLDED
--- linux-6.14/mm/list_lru.c.orig 2025-03-24 15:02:41.000000000 +0100
+++ linux-6.14/mm/list_lru.c 2025-04-04 15:00:26.574714908 +0200
@@ -175,6 +175,7 @@
@@ -165,3 +155,13 @@
bool list_lru_del_obj(struct list_lru *lru, struct list_head *item)
{
+--- linux-6.16/mm/mmap_lock.c~ 2025-07-27 23:26:38.000000000 +0200
++++ linux-6.16/mm/mmap_lock.c 2025-07-31 17:46:12.853651399 +0200
+@@ -178,6 +178,7 @@ inval:
+ count_vm_vma_lock_event(VMA_LOCK_ABORT);
+ return NULL;
+ }
++EXPORT_SYMBOL_GPL(lock_vma_under_rcu);
+ #endif /* CONFIG_PER_VMA_LOCK */
+
+ #ifdef CONFIG_LOCK_MM_AND_FIND_VMA
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 6e6968b7..d9381445 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
-aufs6.15 kbuild patch
+aufs6.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 5b4847bd2fbb5..74a618a3694fb 100644
+index 44b6cdd36dc16..d571db04dfe9d 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -340,6 +340,7 @@ source "fs/pstore/Kconfig"
+@@ -341,6 +341,7 @@ source "fs/pstore/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
@@ -14,22 +14,22 @@ index 5b4847bd2fbb5..74a618a3694fb 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 77fd7f7b5d024..8a7485aad338b 100644
+index 79c08b914c474..dcd049ca86b77 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -128,3 +128,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/
- obj-$(CONFIG_VBOXSF_FS) += vboxsf/
+@@ -129,3 +129,4 @@ obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
obj-$(CONFIG_BPF_LSM) += bpf_fs_kfuncs.o
+ obj-$(CONFIG_RESCTRL_FS) += resctrl/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs6.15 base patch
+aufs6.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index dd844ac8d9107..845564059a505 100644
+index 4bac4ea21b644..9398d61aef93d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3870,6 +3870,19 @@ S: Supported
+@@ -3943,6 +3943,19 @@ S: Supported
F: Documentation/dev-tools/autofdo.rst
F: scripts/Makefile.autofdo
@@ -50,10 +50,10 @@ index dd844ac8d9107..845564059a505 100644
M: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
R: Dave Ertman <david.m.ertman at intel.com>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index e2b1f377f5856..ea328c8498c53 100644
+index 500840e4a74ef..1e879e5d7cc88 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -617,6 +617,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -621,6 +621,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
goto done;
}
@@ -81,10 +81,10 @@ index e2b1f377f5856..ea328c8498c53 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index bd5aa136153ac..f27934816c452 100644
+index 03d58b2d4fa34..7f483c97810f2 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1268,6 +1268,9 @@ enum d_walk_ret {
+@@ -1277,6 +1277,9 @@ enum d_walk_ret {
D_WALK_SKIP,
};
@@ -94,7 +94,7 @@ index bd5aa136153ac..f27934816c452 100644
/**
* d_walk - walk the dentry tree
* @parent: start of walk
-@@ -1276,7 +1279,7 @@ enum d_walk_ret {
+@@ -1285,7 +1288,7 @@ enum d_walk_ret {
*
* The @enter() callbacks are called with d_lock held.
*/
@@ -126,10 +126,10 @@ index 5598e4d574229..90af6a47fbadc 100644
return error;
diff --git a/fs/namespace.c b/fs/namespace.c
-index 1b466c54a357d..45e8ebee87f2a 100644
+index 54c59e091919b..fca52af064af1 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1003,6 +1003,12 @@ static inline int check_mnt(struct mount *mnt)
+@@ -1004,6 +1004,12 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns;
}
@@ -156,10 +156,10 @@ index 4d6df083e0c06..73cd917c821fe 100644
{
if (unlikely(!out->f_op->splice_write))
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index a4fd649e2c3fc..b5505b712998a 100644
+index b085f161ed221..905c976a603a7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -1211,6 +1211,7 @@ extern void fasync_free(struct fasync_struct *);
+@@ -1223,6 +1223,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int);
@@ -167,7 +167,7 @@ index a4fd649e2c3fc..b5505b712998a 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, int who, int force);
extern void f_delown(struct file *filp);
-@@ -2149,6 +2150,7 @@ struct file_operations {
+@@ -2171,6 +2172,7 @@ struct file_operations {
int (*lock) (struct file *, int, struct file_lock *);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
@@ -222,10 +222,10 @@ index 9dec4861d09f6..14583d8468640 100644
+ loff_t *ppos, size_t len, unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 58d78a33ac65b..2dbd6fe56413c 100644
+index dd2bbf73718b0..e3a5bfdb88c62 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -223,7 +223,7 @@ unsigned long max_lock_class_idx;
+@@ -224,7 +224,7 @@ unsigned long max_lock_class_idx;
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
@@ -234,7 +234,7 @@ index 58d78a33ac65b..2dbd6fe56413c 100644
{
unsigned int class_idx = hlock->class_idx;
-@@ -244,6 +244,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
+@@ -245,6 +245,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
@@ -243,13 +243,13 @@ index 58d78a33ac65b..2dbd6fe56413c 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs6.15 mmap patch
+aufs6.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index b0d4e1908b22f..312a7d32aa9c0 100644
+index c667702dc69b8..3ea53a8ca3f9f 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
-@@ -2270,7 +2270,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2276,7 +2276,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
@@ -275,7 +275,7 @@ index c6e7ebc637562..d7ccfd9097646 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 994cde10e3f4d..de38c04f752e7 100644
+index 4be91eb6ea5ca..a6f2d73750f80 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -264,7 +264,8 @@ static void get_vma_name(struct vm_area_struct *vma,
@@ -298,7 +298,7 @@ index 994cde10e3f4d..de38c04f752e7 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
-@@ -3034,7 +3036,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -3037,7 +3039,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
@@ -308,7 +308,7 @@ index 994cde10e3f4d..de38c04f752e7 100644
char buffer[64];
struct mempolicy *pol;
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index bce6745330003..b12b5a75c799c 100644
+index 59bfd61d653aa..95dc1673366a4 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -137,7 +137,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -324,10 +324,10 @@ index bce6745330003..b12b5a75c799c 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index fdda6b16263b3..62034da6a7b13 100644
+index 0ef2ba0c667af..e88ddcbbc8530 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -2578,6 +2578,54 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -2438,6 +2438,54 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm,
unsigned long addr);
@@ -383,7 +383,7 @@ index fdda6b16263b3..62034da6a7b13 100644
void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 56d07edd01f91..d5a8bd5e15ce4 100644
+index d6b91e8a66d6d..811190b21dbba 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -682,6 +682,9 @@ struct vm_region {
@@ -396,7 +396,7 @@ index 56d07edd01f91..d5a8bd5e15ce4 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -838,6 +841,9 @@ struct vm_area_struct {
+@@ -870,6 +873,9 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */
struct file * vm_file; /* File we map to (can be NULL). */
@@ -406,29 +406,8 @@ index 56d07edd01f91..d5a8bd5e15ce4 100644
void * vm_private_data; /* was vm_pte (shared mem) */
#ifdef CONFIG_SWAP
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 168681fc4b25a..cf8e0f7eec280 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -457,6 +457,7 @@ static void vm_area_init_from(const struct vm_area_struct *src,
- dest->anon_vma = src->anon_vma;
- dest->vm_pgoff = src->vm_pgoff;
- dest->vm_file = src->vm_file;
-+ vma_prfile_set(dest, vma_prfile_value((struct vm_area_struct *)src));
- dest->vm_private_data = src->vm_private_data;
- vm_flags_init(dest, src->vm_flags);
- memcpy(&dest->vm_page_prot, &src->vm_page_prot,
-@@ -711,7 +712,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
- if (file) {
- struct address_space *mapping = file->f_mapping;
-
-- get_file(file);
-+ vma_get_file(tmp);
- i_mmap_lock_write(mapping);
- if (vma_is_shared_maywrite(tmp))
- mapping_allow_writable(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index e7f6bbf8ae5f7..aba3d710bc821 100644
+index 1a7a11d4933d1..27728e2ba991a 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -148,3 +148,4 @@ obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
@@ -437,10 +416,10 @@ index e7f6bbf8ae5f7..aba3d710bc821 100644
obj-$(CONFIG_PT_RECLAIM) += pt_reclaim.o
+obj-y += prfile.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 7b90cbeb4a1ad..eff54887b4041 100644
+index bada249b9fb76..661211f75261f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -3767,7 +3767,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3776,7 +3776,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(mapping->host->i_sb);
@@ -450,7 +429,7 @@ index 7b90cbeb4a1ad..eff54887b4041 100644
if (folio->mapping != mapping) {
folio_unlock(folio);
diff --git a/mm/mmap.c b/mm/mmap.c
-index bd210aaf7ebd7..a1af5fb2e4554 100644
+index 09c563c951123..670327a26f75b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1098,6 +1098,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
@@ -517,11 +496,19 @@ index bd210aaf7ebd7..a1af5fb2e4554 100644
if (populate)
mm_populate(ret, populate);
if (!IS_ERR_VALUE(ret))
+@@ -1823,6 +1844,7 @@ __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+ struct address_space *mapping = file->f_mapping;
+
+ get_file(file);
++ vma_get_file(tmp);
+ i_mmap_lock_write(mapping);
+ if (vma_is_shared_maywrite(tmp))
+ mapping_allow_writable(mapping);
diff --git a/mm/nommu.c b/mm/nommu.c
-index 617e7ba8022f5..f7169932a3062 100644
+index b624acec6d2ee..a117fbddaed15 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -519,7 +519,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -537,7 +537,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
@@ -530,7 +517,7 @@ index 617e7ba8022f5..f7169932a3062 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -598,7 +598,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -616,7 +616,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
{
vma_close(vma);
if (vma->vm_file)
@@ -539,7 +526,7 @@ index 617e7ba8022f5..f7169932a3062 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
-@@ -1130,7 +1130,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1132,7 +1132,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
@@ -548,7 +535,7 @@ index 617e7ba8022f5..f7169932a3062 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1216,10 +1216,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1218,10 +1218,10 @@ unsigned long do_mmap(struct file *file,
error:
vma_iter_free(&vmi);
if (region->vm_file)
@@ -654,10 +641,10 @@ index 0000000000000..b034d160a18f4
+}
+#endif /* !CONFIG_MMU */
diff --git a/mm/vma.c b/mm/vma.c
-index a468d4c29c0cd..aef6d4781baa1 100644
+index fef67a66a0959..4febf77b68e30 100644
--- a/mm/vma.c
+++ b/mm/vma.c
-@@ -345,7 +345,7 @@ static void vma_complete(struct vma_prepare *vp, struct vma_iterator *vmi,
+@@ -376,7 +376,7 @@ static void vma_complete(struct vma_prepare *vp, struct vma_iterator *vmi,
if (vp->file) {
uprobe_munmap(vp->remove, vp->remove->vm_start,
vp->remove->vm_end);
@@ -666,7 +653,7 @@ index a468d4c29c0cd..aef6d4781baa1 100644
}
if (vp->remove->anon_vma)
anon_vma_merge(vp->vma, vp->remove);
-@@ -425,7 +425,7 @@ void remove_vma(struct vm_area_struct *vma)
+@@ -460,7 +460,7 @@ void remove_vma(struct vm_area_struct *vma)
might_sleep();
vma_close(vma);
if (vma->vm_file)
@@ -675,7 +662,7 @@ index a468d4c29c0cd..aef6d4781baa1 100644
mpol_put(vma_policy(vma));
vm_area_free(vma);
}
-@@ -499,7 +499,7 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
+@@ -534,7 +534,7 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
@@ -684,7 +671,7 @@ index a468d4c29c0cd..aef6d4781baa1 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -1824,7 +1824,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -1871,7 +1871,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma))
goto out_free_mempol;
if (new_vma->vm_file)
@@ -693,7 +680,7 @@ index a468d4c29c0cd..aef6d4781baa1 100644
if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma);
if (vma_link(mm, new_vma))
-@@ -1838,7 +1838,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -1885,7 +1885,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
vma_close(new_vma);
if (new_vma->vm_file)
@@ -702,14 +689,26 @@ index a468d4c29c0cd..aef6d4781baa1 100644
unlink_anon_vmas(new_vma);
out_free_mempol:
+diff --git a/mm/vma_init.c b/mm/vma_init.c
+index 8e53c7943561e..13fb5979c63a1 100644
+--- a/mm/vma_init.c
++++ b/mm/vma_init.c
+@@ -47,6 +47,7 @@ static void vm_area_init_from(const struct vm_area_struct *src,
+ dest->anon_vma = src->anon_vma;
+ dest->vm_pgoff = src->vm_pgoff;
+ dest->vm_file = src->vm_file;
++ vma_prfile_set(dest, vma_prfile_value((struct vm_area_struct *)src));
+ dest->vm_private_data = src->vm_private_data;
+ vm_flags_init(dest, src->vm_flags);
+ memcpy(&dest->vm_page_prot, &src->vm_page_prot,
SPDX-License-Identifier: GPL-2.0
-aufs6.15 standalone patch
+aufs6.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index f27934816c452..d711c216bd070 100644
+index 7f483c97810f2..7f1b9af1355be 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
-@@ -1378,6 +1378,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1387,6 +1387,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1;
goto again;
}
@@ -717,7 +716,7 @@ index f27934816c452..d711c216bd070 100644
struct check_mount {
struct vfsmount *mnt;
-@@ -2894,6 +2895,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2902,6 +2903,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
@@ -726,16 +725,16 @@ index f27934816c452..d711c216bd070 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 8e4ea5f1e64c6..fcdda54dd4c9e 100644
+index 1f5fdd2e096e3..34d831a775c13 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -114,6 +114,7 @@ bool path_noexec(const struct path *path)
+@@ -117,6 +117,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
+EXPORT_SYMBOL_GPL(path_noexec);
- #ifdef CONFIG_USELIB
+ #ifdef CONFIG_MMU
/*
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 90af6a47fbadc..7d4eaaff13bc9 100644
@@ -750,7 +749,7 @@ index 90af6a47fbadc..7d4eaaff13bc9 100644
/*
* Allocate an file->f_owner struct if it doesn't exist, handling racing
diff --git a/fs/file_table.c b/fs/file_table.c
-index c04ed94cdc4b2..2b464937aaf19 100644
+index 138114d643077..1b95604f19e29 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -253,6 +253,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@@ -762,10 +761,10 @@ index c04ed94cdc4b2..2b464937aaf19 100644
/*
* Variant of alloc_empty_file() that doesn't check and modify nr_files.
diff --git a/fs/namespace.c b/fs/namespace.c
-index 45e8ebee87f2a..c72ef12585d32 100644
+index fca52af064af1..1c172584695ea 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1008,6 +1008,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -1009,6 +1009,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
{
return check_mnt(real_mount(mnt));
}
@@ -773,30 +772,22 @@ index 45e8ebee87f2a..c72ef12585d32 100644
static inline bool check_anonymous_mnt(struct mount *mnt)
{
-@@ -2346,6 +2347,7 @@ struct vfsmount *collect_mounts(const struct path *path)
- return ERR_CAST(tree);
- return &tree->mnt;
+@@ -2365,6 +2366,7 @@ struct path *collect_paths(const struct path *path,
+ path_get(p);
+ return res;
}
-+EXPORT_SYMBOL_GPL(collect_mounts);
++EXPORT_SYMBOL_GPL(collect_paths);
- static void free_mnt_ns(struct mnt_namespace *);
- static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *, bool);
-@@ -2429,6 +2431,7 @@ void drop_collected_mounts(struct vfsmount *mnt)
- unlock_mount_hash();
- namespace_unlock();
- }
-+EXPORT_SYMBOL_GPL(drop_collected_mounts);
-
- static bool __has_locked_children(struct mount *mnt, struct dentry *dentry)
+ void drop_collected_paths(struct path *paths, struct path *prealloc)
{
-@@ -2531,6 +2534,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- }
- return 0;
+@@ -2373,6 +2375,7 @@ void drop_collected_paths(struct path *paths, struct path *prealloc)
+ if (paths != prealloc)
+ kfree(paths);
}
-+EXPORT_SYMBOL_GPL(iterate_mounts);
++EXPORT_SYMBOL_GPL(drop_collected_paths);
- static void lock_mnt_tree(struct mount *mnt)
- {
+ static void free_mnt_ns(struct mnt_namespace *);
+ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *, bool);
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index e2b4f17a48bb7..7a411ea72cea4 100644
--- a/fs/notify/fsnotify.c
@@ -822,10 +813,10 @@ index 18446b7b0d495..09138e0b8a6a5 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
-index a9063cca99118..e0bfa20a14e9f 100644
+index 7828234a7caa4..bdc55f69a9dba 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -66,6 +66,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
+@@ -69,6 +69,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
inode_unlock(dentry->d_inode);
return ret;
}
@@ -834,10 +825,10 @@ index a9063cca99118..e0bfa20a14e9f 100644
int vfs_truncate(const struct path *path, loff_t length)
{
diff --git a/fs/read_write.c b/fs/read_write.c
-index bb0ed26a0b3ae..2fe0b1f9b42e5 100644
+index 0ef70e128c4af..52806554f78e9 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
-@@ -577,6 +577,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -579,6 +579,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
inc_syscr(current);
return ret;
}
@@ -845,7 +836,7 @@ index bb0ed26a0b3ae..2fe0b1f9b42e5 100644
static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
{
-@@ -692,6 +693,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -694,6 +695,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
file_end_write(file);
return ret;
}
@@ -866,7 +857,7 @@ index 73cd917c821fe..eb7b4d93a3523 100644
/*
* Indicate to the caller that there was a premature EOF when reading from the
diff --git a/fs/xattr.c b/fs/xattr.c
-index 8ec5b0204bfdc..29b754a861fc3 100644
+index 600ae97969cf2..ffe4d60b01f96 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -405,6 +405,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry,
@@ -878,10 +869,10 @@ index 8ec5b0204bfdc..29b754a861fc3 100644
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 2dbd6fe56413c..0eba3fe81a0a5 100644
+index e3a5bfdb88c62..d82ca73a54e61 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
-@@ -244,6 +244,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -245,6 +245,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
*/
return lock_classes + class_idx;
}
@@ -899,7 +890,7 @@ index d1efec571a4a4..eed18cc26c370 100644
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
-index fb57e8fddd911..bb46cbe40f6ae 100644
+index 596d418185773..19fd676e50c1b 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1948,6 +1948,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -2949,7 +2940,7 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/branch.c 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -4803,7 +4794,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2025-06-12 17:13:39.183320207 +0200
++++ linux/fs/aufs/cpup.c 2025-07-31 17:41:30.156472983 +0200
@@ -0,0 +1,1466 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6273,7 +6264,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/cpup.h 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,101 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -6378,7 +6369,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2025-06-12 17:13:39.183320207 +0200
++++ linux/fs/aufs/dbgaufs.c 2025-07-31 17:41:30.156472983 +0200
@@ -0,0 +1,525 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -7336,7 +7327,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
+#endif /* __AUFS_DCSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
--- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/debug.c 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,448 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -8018,7 +8009,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/dentry.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,1228 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -9250,7 +9241,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/dentry.h 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,270 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -10083,7 +10074,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
--- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/dir.c 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12453,8 +12444,8 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2025-04-28 09:59:24.959988804 +0200
-@@ -0,0 +1,365 @@
++++ linux/fs/aufs/dynop.c 2025-07-31 17:41:30.586472983 +0200
+@@ -0,0 +1,364 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2010-2025 Junjiro R. Okajima
@@ -12631,7 +12622,6 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
+
+ AuDbg("%s\n", au_sbtype(h_sb));
+
-+ DySetAop(writepage);
+ DySetAopForce(read_folio); /* force */
+ DySetAop(writepages);
+ DySetAop(dirty_folio);
@@ -12903,8 +12893,8 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2025-04-28 09:59:24.959988804 +0200
-@@ -0,0 +1,846 @@
++++ linux/fs/aufs/export.c 2025-07-31 17:41:30.586472983 +0200
+@@ -0,0 +1,828 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2025 Junjiro R. Okajima
@@ -13179,32 +13169,11 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+/* todo: dirty? */
+/* if exportfs_decode_fh() passed vfsmount*, we could be happy */
+
-+struct au_compare_mnt_args {
-+ /* input */
-+ struct super_block *sb;
-+
-+ /* output */
-+ struct vfsmount *mnt;
-+};
-+
-+static int au_compare_mnt(struct vfsmount *mnt, void *arg)
-+{
-+ struct au_compare_mnt_args *a = arg;
-+
-+ if (mnt->mnt_sb != a->sb)
-+ return 0;
-+ a->mnt = mntget(mnt);
-+ return 1;
-+}
-+
+static struct vfsmount *au_mnt_get(struct super_block *sb)
+{
-+ int err;
-+ struct path root;
+ struct vfsmount *mnt;
-+ struct au_compare_mnt_args args = {
-+ .sb = sb
-+ };
++ struct path root, *paths, *p;
++ struct path a[8];
+
+ get_fs_root(current->fs, &root);
+ /*
@@ -13212,23 +13181,26 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+ * Really?
+ */
+ si_read_unlock(sb);
-+ mnt = collect_mounts(&root);
-+ if (IS_ERR(mnt)) {
-+ args.mnt = mnt;
++ paths = collect_paths(&root, a, ARRAY_SIZE(a));
++ if (IS_ERR(paths)) {
++ mnt = ERR_CAST(paths);
+ goto out;
+ }
+
-+ rcu_read_lock();
-+ err = iterate_mounts(au_compare_mnt, &args, mnt);
-+ rcu_read_unlock();
-+ drop_collected_mounts(mnt);
-+ AuDebugOn(!err);
++ for (p = paths; p->dentry; p++) {
++ mnt = p->mnt;
++ if (mnt->mnt_sb == sb) {
++ mntget(mnt);
++ break;
++ }
++ }
++ drop_collected_paths(paths, a);
+
+out:
+ si_noflush_read_lock(sb);
-+ AuDebugOn(!args.mnt);
++ AuDebugOn(!mnt);
+ path_put(&root);
-+ return args.mnt;
++ return mnt;
+}
+
+struct au_nfsd_si_lock {
@@ -14183,8 +14155,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2025-04-28 09:59:24.959988804 +0200
-@@ -0,0 +1,858 @@
++++ linux/fs/aufs/file.c 2025-07-31 17:41:30.586472983 +0200
+@@ -0,0 +1,854 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2025 Junjiro R. Okajima
@@ -14985,8 +14957,6 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+ loff_t pos, unsigned len, unsigned copied,
+ struct folio *folio, void *fsdata)
+{ AuUnsupport(); return 0; }
-+static int aufs_writepage(struct page *page, struct writeback_control *wbc)
-+{ AuUnsupport(); return 0; }
+
+static bool aufs_dirty_folio(struct address_space *mapping, struct folio *folio)
+{ AuUnsupport(); return true; }
@@ -15023,8 +14993,6 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+ .read_folio = aufs_read_folio,
+ .direct_IO = aufs_direct_IO,
+#ifdef CONFIG_AUFS_DEBUG
-+ .writepage = aufs_writepage,
-+ /* no writepages, because of writepage */
+ .dirty_folio = aufs_dirty_folio,
+ /* no readpages, because of readpage */
+ .write_begin = aufs_write_begin,
@@ -15391,7 +15359,7 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
+#endif /* __AUFS_FILE_H__ */
diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
--- /usr/share/empty/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/finfo.c 2025-07-24 19:31:57.789847457 +0200
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -16328,7 +16296,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+};
diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c
--- /usr/share/empty/fs/aufs/fsctx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fsctx.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/fsctx.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,1244 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18426,7 +18394,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/hnotify.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19436,7 +19404,7 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
--- /usr/share/empty/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/inode.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,532 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19972,7 +19940,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/inode.h 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,727 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -20927,7 +20895,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/i_op_add.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,979 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -21910,7 +21878,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/i_op.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,1522 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -23963,7 +23931,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/i_op_ren.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,1264 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25231,7 +25199,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
+}
diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
--- /usr/share/empty/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig 2025-04-28 09:59:24.959988804 +0200
++++ linux/fs/aufs/Kconfig 2025-07-24 19:31:57.786514124 +0200
@@ -0,0 +1,201 @@
+# SPDX-License-Identifier: GPL-2.0
+config AUFS_FS
@@ -25872,7 +25840,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2025-06-12 17:13:39.183320207 +0200
++++ linux/fs/aufs/Makefile 2025-07-31 17:41:30.156472983 +0200
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -26202,7 +26170,7 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
+module_exit(aufs_exit);
diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
--- /usr/share/empty/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/module.h 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -26386,7 +26354,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/mvdown.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,714 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -27104,7 +27072,7 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/opts.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,1030 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -28138,7 +28106,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/opts.h 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,264 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -29265,7 +29233,7 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/rdu.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29653,7 +29621,7 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2025-04-28 09:59:30.493322137 +0200
++++ linux/fs/aufs/rwsem.h 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -30066,7 +30034,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/super.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,872 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -30942,7 +30910,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/super.h 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,618 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -32307,7 +32275,7 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2025-04-28 09:59:24.963322138 +0200
++++ linux/fs/aufs/vdir.c 2025-07-24 19:31:57.793180791 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33207,8 +33175,8 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2025-06-12 17:13:39.186653540 +0200
-@@ -0,0 +1,971 @@
++++ linux/fs/aufs/vfsub.c 2025-07-31 17:41:30.586472983 +0200
+@@ -0,0 +1,972 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2025 Junjiro R. Okajima
@@ -33430,7 +33398,8 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+{
+ struct path path;
+
-+ path.dentry = lookup_one_len_unlocked(name, ppath->dentry, len);
++ path.dentry = lookup_noperm_unlocked(&QSTR_LEN(name, len),
++ ppath->dentry);
+ if (IS_ERR(path.dentry))
+ goto out;
+ if (d_is_positive(path.dentry)) {
@@ -33451,7 +33420,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+ /* VFS checks it too, but by WARN_ON_ONCE() */
+ IMustLock(d_inode(ppath->dentry));
+
-+ path.dentry = lookup_one_len(name, ppath->dentry, len);
++ path.dentry = lookup_noperm(&QSTR_LEN(name, len), ppath->dentry);
+ if (IS_ERR(path.dentry))
+ goto out;
+ if (d_is_positive(path.dentry)) {
@@ -34182,7 +34151,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/vfsub.h 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,441 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34627,7 +34596,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2025-06-12 17:13:39.186653540 +0200
++++ linux/fs/aufs/wbr_policy.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,835 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -35466,7 +35435,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2025-06-12 17:13:39.189986873 +0200
++++ linux/fs/aufs/whout.c 2025-07-31 17:41:30.159806316 +0200
@@ -0,0 +1,1096 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -37031,7 +37000,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2025-04-28 09:59:24.966655471 +0200
++++ linux/fs/aufs/wkq.h 2025-07-24 19:31:57.796514124 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -39418,7 +39387,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2025-06-12 17:13:39.189986873 +0200
++++ linux/include/uapi/linux/aufs_type.h 2025-07-31 17:41:30.586472983 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39462,7 +39431,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "6.15-20250602"
++#define AUFS_VERSION "6.x-rcN-20250707"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39873,10 +39842,10 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs6.15 loopback patch
+aufs6.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index ea328c8498c53..a16d0b2d74f35 100644
+index 1e879e5d7cc88..bdadcca492f08 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -52,7 +52,7 @@ struct loop_device {
@@ -39888,7 +39857,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
unsigned int lo_min_dio_size;
struct block_device *lo_device;
-@@ -428,6 +428,15 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
+@@ -432,6 +432,15 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
}
}
@@ -39904,7 +39873,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
static void loop_reread_partitions(struct loop_device *lo)
{
int rc;
-@@ -529,6 +538,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -533,6 +542,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
{
struct file *file = fget(arg);
struct file *old_file;
@@ -39912,7 +39881,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
unsigned int memflags;
int error;
bool partscan;
-@@ -557,11 +567,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -561,11 +571,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
goto out_err;
@@ -39932,7 +39901,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
error = -EINVAL;
-@@ -581,6 +599,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -585,6 +603,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
memflags = blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
loop_assign_backing_file(lo, file);
@@ -39940,7 +39909,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
loop_update_dio(lo);
blk_mq_unfreeze_queue(lo->lo_queue, memflags);
partscan = lo->lo_flags & LO_FLAGS_PARTSCAN;
-@@ -600,6 +619,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -604,6 +623,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
@@ -39950,7 +39919,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 0);
if (partscan)
loop_reread_partitions(lo);
-@@ -613,6 +635,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -617,6 +639,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
loop_global_unlock(lo, is_loop);
out_putf:
fput(file);
@@ -39960,7 +39929,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 0);
goto done;
}
-@@ -990,6 +1015,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -994,6 +1019,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
const struct loop_config *config)
{
struct file *file = fget(config->fd);
@@ -39968,7 +39937,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
struct queue_limits lim;
int error;
loff_t size;
-@@ -1008,6 +1034,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1012,6 +1038,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
/* This is safe, since we have a reference from open(). */
__module_get(THIS_MODULE);
@@ -39982,7 +39951,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner.
-@@ -1062,6 +1095,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1066,6 +1099,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
lo->lo_device = bdev;
loop_assign_backing_file(lo, file);
@@ -39990,7 +39959,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
lim = queue_limits_start_update(lo->lo_queue);
loop_update_limits(lo, &lim, config->block_size);
-@@ -1112,6 +1146,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1116,6 +1150,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
@@ -39999,7 +39968,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
return error;
-@@ -1121,11 +1157,13 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1125,11 +1161,13 @@ static void __loop_clr_fd(struct loop_device *lo)
{
struct queue_limits lim;
struct file *filp;
@@ -40013,7 +39982,7 @@ index ea328c8498c53..a16d0b2d74f35 100644
spin_unlock_irq(&lo->lo_lock);
lo->lo_device = NULL;
-@@ -1192,6 +1230,8 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1196,6 +1234,8 @@ static void __loop_clr_fd(struct loop_device *lo)
* fput can take open_mutex which is usually taken before lo_mutex.
*/
fput(filp);
@@ -40098,10 +40067,10 @@ index e867aa6e757a6..4a4f96e294315 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index b5505b712998a..d6f09e38145af 100644
+index 905c976a603a7..7c9e30264745f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2319,6 +2319,11 @@ struct super_operations {
+@@ -2370,6 +2370,11 @@ struct super_operations {
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
void (*shutdown)(struct super_block *sb);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index b90b8304..9839e553 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -60,9 +60,6 @@ CRYPTO_SHA1_ARM_NEON arm=m
CRYPTO_SHA1_SSSE3 all=m
CRYPTO_SHA256_ARM arm=m
CRYPTO_SHA256_ARM64 arm64=m
-CRYPTO_SHA256_SSSE3 all=m
-CRYPTO_SHA2_ARM64_CE arm64=m
-CRYPTO_SHA2_ARM_CE arm=m
CRYPTO_SHA3_ARM64 arm64=m
CRYPTO_SHA512_ARM arm=m
CRYPTO_SHA512_ARM64 arm64=m
@@ -231,13 +228,12 @@ CRYPTO_HASH all=y
CRYPTO_AKCIPHER all=y
CRYPTO_MANAGER all=y
CRYPTO_USER all=m
-CRYPTO_MANAGER_DISABLE_TESTS all=y
CRYPTO_NULL all=m
CRYPTO_PCRYPT all=m
CRYPTO_CRYPTD all=m
CRYPTO_AUTHENC all=m
CRYPTO_KRB5ENC all=m
-CRYPTO_TEST all=m
+CRYPTO_BENCHMARK all=m
CRYPTO_RSA all=y
CRYPTO_DH all=y
CRYPTO_DH_RFC7919_GROUPS all=y
@@ -289,13 +285,11 @@ CRYPTO_HMAC all=y
CRYPTO_MD4 all=m
CRYPTO_MD5 all=y
CRYPTO_MICHAEL_MIC all=m
-CRYPTO_POLY1305 all=m
CRYPTO_RMD160 all=m
CRYPTO_SHA1 all=y
CRYPTO_SHA256 all=y
CRYPTO_SHA512 all=y
CRYPTO_SHA3 all=y
-CRYPTO_SM3 all=m
CRYPTO_SM3_GENERIC all=m
CRYPTO_STREEBOG all=m
CRYPTO_WP512 all=m
@@ -770,6 +764,7 @@ BLK_DEV_RBD all=m
BLK_DEV_UBLK all=m
BLKDEV_UBLK_LEGACY_OPCODES all=y
#- file drivers/block/rnbd/Kconfig goes here
+BLK_DEV_ZONED_LOOP all=m
#-
#- *** FILE: drivers/block/drbd/Kconfig ***
@@ -821,7 +816,6 @@ ZRAM_MULTI_COMP all=y
BT_HCIBTUSB all=m
BT_HCIBTUSB_AUTOSUSPEND all=y
BT_HCIBTUSB_POLL_SYNC all=y
-BT_HCIBTUSB_AUTO_ISOC_ALT all=y
BT_HCIBTUSB_BCM all=y
BT_HCIBTUSB_MTK all=y
BT_HCIBTUSB_RTL all=y
@@ -1003,6 +997,7 @@ TCG_CRB all=m
TCG_ARM_CRB_FFA arm64=m
TCG_VTPM_PROXY all=m
TCG_FTPM_TEE arm=m arm64=m
+TCG_SVSM all=m
#- file drivers/char/tpm/st33zp24/Kconfig goes here
#-
@@ -1077,6 +1072,7 @@ COMMON_CLK_FIXED_MMIO all=y
#- file drivers/clk/sifive/Kconfig goes here
#- file drivers/clk/socfpga/Kconfig goes here
#- file drivers/clk/sophgo/Kconfig goes here
+#- file drivers/clk/spacemit/Kconfig goes here
#- file drivers/clk/sprd/Kconfig goes here
#- file drivers/clk/starfive/Kconfig goes here
#- file drivers/clk/sunxi/Kconfig goes here
@@ -1407,7 +1403,6 @@ CRYPTO_DEV_CCP all=y
#- file drivers/crypto/cavium/nitrox/Kconfig goes here
#- file drivers/crypto/marvell/Kconfig goes here
#- file drivers/crypto/intel/Kconfig goes here
-CRYPTO_DEV_CAVIUM_ZIP arm64=m
CRYPTO_DEV_ROCKCHIP arm64=m
CRYPTO_DEV_ROCKCHIP_DEBUG arm64=n
#- file drivers/crypto/chelsio/Kconfig goes here
@@ -1469,6 +1464,7 @@ CRYPTO_DEV_QAT_C3XXX all=m
CRYPTO_DEV_QAT_C62X all=m
CRYPTO_DEV_QAT_4XXX all=m
CRYPTO_DEV_QAT_420XX all=m
+CRYPTO_DEV_QAT_6XXX all=m
CRYPTO_DEV_QAT_DH895xCCVF all=m
CRYPTO_DEV_QAT_C3XXXVF all=m
CRYPTO_DEV_QAT_C62XVF all=m
@@ -1831,6 +1827,12 @@ MESON_SM arm64=m
#-
ARM_PSCI_CHECKER arm=n arm64=n
+#-
+#- *** FILE: drivers/firmware/qcom/Kconfig ***
+#-
+QCOM_TZMEM_MODE_GENERIC all=y
+QCOM_TZMEM_MODE_SHMBRIDGE all=n
+
#-
#- *** FILE: drivers/firmware/smccc/Kconfig ***
#-
@@ -2022,7 +2024,7 @@ GPIO_VIRTUSER all=m
#- *** FILE: drivers/gpu/drm/Kconfig ***
#-
DRM all=m
-DRM_DEBUG_MM all=n
+#- file drivers/gpu/drm/Kconfig.debug goes here
DRM_PANIC all=y
DRM_PANIC_FOREGROUND_COLOR all=0xffffff
DRM_PANIC_BACKGROUND_COLOR all=0x000000
@@ -2031,10 +2033,12 @@ DRM_PANIC_SCREEN all="kmsg"
#- file drivers/gpu/drm/clients/Kconfig goes here
DRM_LOAD_EDID_FIRMWARE all=y
#- file drivers/gpu/drm/display/Kconfig goes here
+#- file drivers/gpu/drm/sysfb/Kconfig goes here
#- file drivers/gpu/drm/arm/Kconfig goes here
#- file drivers/gpu/drm/radeon/Kconfig goes here
#- file drivers/gpu/drm/amd/amdgpu/Kconfig goes here
#- file drivers/gpu/drm/nouveau/Kconfig goes here
+#- file drivers/gpu/drm/nova/Kconfig goes here
#- file drivers/gpu/drm/i915/Kconfig goes here
#- file drivers/gpu/drm/xe/Kconfig goes here
#- file drivers/gpu/drm/kmb/Kconfig goes here
@@ -2087,11 +2091,17 @@ DRM_VGEM all=m
#- file drivers/gpu/drm/adp/Kconfig goes here
#- file drivers/gpu/drm/xlnx/Kconfig goes here
#- file drivers/gpu/drm/gud/Kconfig goes here
+#- file drivers/gpu/drm/sitronix/Kconfig goes here
#- file drivers/gpu/drm/solomon/Kconfig goes here
#- file drivers/gpu/drm/sprd/Kconfig goes here
#- file drivers/gpu/drm/imagination/Kconfig goes here
DRM_HYPERV=m
+#-
+#- *** FILE: drivers/gpu/drm/Kconfig.debug ***
+#-
+DRM_DEBUG_MM all=n
+
#-
#- *** FILE: drivers/gpu/drm/amd/acp/Kconfig ***
#-
@@ -2550,6 +2560,15 @@ ROCKCHIP_LVDS arm64=y
ROCKCHIP_RGB arm64=y
ROCKCHIP_RK3066_HDMI arm64=n
+#-
+#- *** FILE: drivers/gpu/drm/sitronix/Kconfig ***
+#-
+DRM_ST7571_I2C all=m
+TINYDRM_ST7586 all=m
+DRM_ST7586 all=m
+TINYDRM_ST7735R all=m
+DRM_ST7735R all=m
+
#-
#- *** FILE: drivers/gpu/drm/solomon/Kconfig ***
#-
@@ -2568,6 +2587,11 @@ DRM_STI arm=m
DRM_STM arm=m
DRM_STM_DSI arm=m
+#-
+#- *** FILE: drivers/gpu/drm/sysfb/Kconfig ***
+#-
+DRM_SIMPLEDRM=m
+
#-
#- *** FILE: drivers/gpu/drm/tidss/Kconfig ***
#-
@@ -2587,7 +2611,6 @@ DRM_BOCHS all=m
DRM_CIRRUS_QEMU all=m
DRM_GM12U320 all=m
DRM_PANEL_MIPI_DBI all=m
-DRM_SIMPLEDRM=m
TINYDRM_HX8357D all=m
TINYDRM_ILI9163 all=m
TINYDRM_ILI9225 all=m
@@ -2596,8 +2619,6 @@ TINYDRM_ILI9486 all=m
TINYDRM_MI0283QT all=m
TINYDRM_REPAPER all=m
TINYDRM_SHARP_MEMORY all=m
-TINYDRM_ST7586 all=m
-TINYDRM_ST7735R all=m
#-
#- *** FILE: drivers/gpu/drm/tve200/Kconfig ***
@@ -2648,6 +2669,7 @@ DRM_VMWGFX_MKSSTATS all=y
DRM_XE all=m
DRM_XE_DISPLAY all=y
DRM_XE_DP_TUNNEL all=y
+DRM_XE_GPUSVM all=y
DRM_XE_DEVMEM_MIRROR all=y
DRM_XE_FORCE_PROBE all=""
#- file drivers/gpu/drm/xe/Kconfig.debug goes here
@@ -2938,6 +2960,8 @@ SENSORS_ASUS_ROG_RYUJIN all=m
SENSORS_AXI_FAN_CONTROL all=m
SENSORS_K8TEMP all=m
SENSORS_K10TEMP all=m
+SENSORS_KBATT all=m
+SENSORS_KFAN all=m
SENSORS_FAM15H_POWER all=m
SENSORS_APPLESMC all=m
SENSORS_ARM_SCMI arm=m arm64=m
@@ -3014,6 +3038,7 @@ SENSORS_MAX6639 all=m
SENSORS_MAX6650 all=m
SENSORS_MAX6697 all=m
SENSORS_MAX31790 all=m
+SENSORS_MAX77705 all=m
SENSORS_MC34VR500 all=m
SENSORS_MCP3021 all=m
SENSORS_MLXREG_FAN all=m
@@ -3052,7 +3077,6 @@ SENSORS_NZXT_KRAKEN2 all=m
SENSORS_NZXT_KRAKEN3 all=m
SENSORS_NZXT_SMART2 all=m
#- file drivers/hwmon/occ/Kconfig goes here
-SENSORS_OXP all=m
SENSORS_PCF8591 all=m
#- file drivers/hwmon/peci/Kconfig goes here
#- file drivers/hwmon/pmbus/Kconfig goes here
@@ -3062,7 +3086,6 @@ SENSORS_QNAP_MCU_HWMON all=m
SENSORS_RASPBERRYPI_HWMON arm=m arm64=m
SENSORS_SL28CPLD all=m
SENSORS_SBTSI all=m
-SENSORS_SBRMI all=m
SENSORS_SHT15 all=m
SENSORS_SHT21 all=m
SENSORS_SHT3x all=m
@@ -3168,6 +3191,8 @@ SENSORS_IRPS5401 all=m
SENSORS_ISL68137 all=m
SENSORS_LM25066 all=m
SENSORS_LM25066_REGULATOR all=y
+SENSORS_LT3074 all=m
+SENSORS_LT3074_REGULATOR all=m
SENSORS_LT7182S all=m
SENSORS_LTC2978 all=m
SENSORS_LTC2978_REGULATOR all=y
@@ -3318,6 +3343,7 @@ I2C_CGBC all=m
I2C_DESIGNWARE_CORE all=m
I2C_DESIGNWARE_SLAVE all=y
I2C_DESIGNWARE_PLATFORM all=m
+I2C_DESIGNWARE_AMDISP all=m
I2C_DESIGNWARE_AMDPSP all=y
I2C_DESIGNWARE_BAYTRAIL all=y
I2C_DESIGNWARE_PCI all=m
@@ -3565,6 +3591,7 @@ MEN_Z188_ADC all=m
MESON_SARADC arm64=m
MP2629_ADC all=m
NAU7802 all=m
+NCT7201 all=m
PAC1921 all=m
PAC1934 all=m
QCOM_PM8XXX_XOADC arm=m
@@ -3572,6 +3599,7 @@ QCOM_SPMI_IADC all=m
QCOM_SPMI_VADC all=m
QCOM_SPMI_ADC5 all=m
RN5T618_ADC all=m
+ROHM_BD79124 all=m
ROCKCHIP_SARADC arm64=m
RICHTEK_RTQ6056 all=m
SD_ADC_MODULATOR all=m
@@ -3579,21 +3607,21 @@ STMPE_ADC all=m
TI_ADC081C all=m
TI_ADC0832 all=m
TI_ADC084S021 all=m
-TI_ADC12138 all=m
TI_ADC108S102 all=m
+TI_ADC12138 all=m
TI_ADC128S052 all=m
TI_ADC161S626 all=m
TI_ADS1015 all=m
+TI_ADS1100 all=m
TI_ADS1119 all=m
+TI_ADS124S08 all=m
+TI_ADS1298 all=m
+TI_ADS131E08 all=m
TI_ADS7138 all=m
TI_ADS7924 all=m
-TI_ADS1100 all=m
-TI_ADS1298 all=m
TI_ADS7950 all=m
TI_ADS8344 all=m
TI_ADS8688 all=m
-TI_ADS124S08 all=m
-TI_ADS131E08 all=m
TI_AM335X_ADC all=m
TI_LMP92064 all=m
TI_TLC4541 all=m
@@ -3646,11 +3674,13 @@ BME680 all=m
CCS811 all=m
ENS160 all=m
IAQCORE all=m
+MHZ19B all=m
PMS7003 all=m
SCD30_CORE all=m
SCD30_I2C all=m
SCD30_SERIAL all=m
SCD4X all=m
+SEN0322 all=m
SENSIRION_SGP30 all=m
SENSIRION_SGP40 all=m
SPS30 all=m
@@ -3680,6 +3710,7 @@ IIO_SSP_SENSORHUB all=m
#-
#- *** FILE: drivers/iio/dac/Kconfig ***
#-
+AD3530R all=m
AD3552R_HS all=m
AD3552R all=m
AD5064 all=m
@@ -4682,18 +4713,12 @@ IOMMU_DEFAULT_DMA_STRICT all=n
IOMMU_DEFAULT_DMA_LAZY all=n
IOMMU_DEFAULT_PASSTHROUGH all=y
#- file drivers/iommu/amd/Kconfig goes here
+#- file drivers/iommu/arm/Kconfig goes here
#- file drivers/iommu/intel/Kconfig goes here
#- file drivers/iommu/iommufd/Kconfig goes here
#- file drivers/iommu/riscv/Kconfig goes here
IRQ_REMAP all=y
ROCKCHIP_IOMMU arm64=y
-ARM_SMMU arm=m arm64=m
-ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT arm=y arm64=y
-ARM_SMMU_MMU_500_CPRE_ERRATA arm=y arm64=y
-ARM_SMMU_V3 arm64=m
-ARM_SMMU_V3_SVA arm64=y
-ARM_SMMU_V3_IOMMUFD arm64=n
-TEGRA241_CMDQV arm64=n
HYPERV_IOMMU all=y
VIRTIO_IOMMU=m
@@ -4702,6 +4727,17 @@ VIRTIO_IOMMU=m
#-
AMD_IOMMU all=y
+#-
+#- *** FILE: drivers/iommu/arm/Kconfig ***
+#-
+ARM_SMMU arm=m arm64=m
+ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT arm=y arm64=y
+ARM_SMMU_MMU_500_CPRE_ERRATA arm=y arm64=y
+ARM_SMMU_V3 arm64=m
+ARM_SMMU_V3_SVA arm64=y
+ARM_SMMU_V3_IOMMUFD arm64=n
+TEGRA241_CMDQV arm64=n
+
#-
#- *** FILE: drivers/iommu/intel/Kconfig ***
#-
@@ -5289,6 +5325,8 @@ VIDEO_MT9V111 all=m
VIDEO_OG01A1B all=m
VIDEO_OV01A10 all=m
VIDEO_OV02A10 all=m
+VIDEO_OV02E10 all=m
+VIDEO_OV02C10 all=m
VIDEO_OV08D10 all=m
VIDEO_OV08X40 all=m
VIDEO_OV13858 all=m
@@ -5327,6 +5365,8 @@ VIDEO_RJ54N1 all=m
VIDEO_S5C73M3 all=m
VIDEO_S5K5BAF all=m
VIDEO_S5K6A3 all=m
+VIDEO_VD55G1 all=m
+VIDEO_VD56G3 all=m
VIDEO_VGXY61 all=m
#- file drivers/media/i2c/ccs/Kconfig goes here
#- file drivers/media/i2c/et8ek8/Kconfig goes here
@@ -5405,7 +5445,6 @@ MEDIA_PCI_SUPPORT all=y
#- Media capture support
#- file drivers/media/pci/mgb4/Kconfig goes here
#- file drivers/media/pci/solo6x10/Kconfig goes here
-#- file drivers/media/pci/sta2x11/Kconfig goes here
#- file drivers/media/pci/tw5864/Kconfig goes here
#- file drivers/media/pci/tw68/Kconfig goes here
#- file drivers/media/pci/tw686x/Kconfig goes here
@@ -5598,11 +5637,6 @@ DVB_SMIPCIE all=m
#-
VIDEO_SOLO6X10 all=n x32=n x86_64=m
-#-
-#- *** FILE: drivers/media/pci/sta2x11/Kconfig ***
-#-
-STA2X11_VIP all=m
-
#-
#- *** FILE: drivers/media/pci/ttpci/Kconfig ***
#-
@@ -5725,6 +5759,7 @@ VIDEO_RP1_CFE all=m
#- *** FILE: drivers/media/platform/renesas/Kconfig ***
#-
#- Renesas media platform drivers
+#- file drivers/media/platform/renesas/rcar-isp/Kconfig goes here
#- file drivers/media/platform/renesas/rcar-vin/Kconfig goes here
#- file drivers/media/platform/renesas/rzg2l-cru/Kconfig goes here
VIDEO_RENESAS_VSP1 all=m
@@ -6390,6 +6425,7 @@ DUMMY_IRQ all=m
IBM_ASM i386=m x86_64=m
PHANTOM all=m
RPMB all=m
+TI_FPC202 all=m
TIFM_CORE all=m
TIFM_7XX1 all=m
ICS932S401 all=m
@@ -6435,7 +6471,6 @@ MCHP_LAN966X_PCI all=m
#- file drivers/misc/mei/Kconfig goes here
#- file drivers/misc/vmw_vmci/Kconfig goes here
#- file drivers/misc/genwqe/Kconfig goes here
-#- file drivers/misc/echo/Kconfig goes here
#- file drivers/misc/ocxl/Kconfig goes here
#- file drivers/misc/bcm-vk/Kconfig goes here
#- file drivers/misc/cardreader/Kconfig goes here
@@ -6443,6 +6478,7 @@ MCHP_LAN966X_PCI all=m
#- file drivers/misc/pvpanic/Kconfig goes here
#- file drivers/misc/mchp_pci1xxxx/Kconfig goes here
#- file drivers/misc/keba/Kconfig goes here
+#- file drivers/misc/amd-sbi/Kconfig goes here
#-
#- *** FILE: drivers/misc/altera-stapl/Kconfig ***
@@ -6450,6 +6486,12 @@ MCHP_LAN966X_PCI all=m
#- Altera FPGA firmware download module (requires I2C)
ALTERA_STAPL all=m
+#-
+#- *** FILE: drivers/misc/amd-sbi/Kconfig ***
+#-
+AMD_SBRMI_I2C all=m
+AMD_SBRMI_HWMON all=y
+
#-
#- *** FILE: drivers/misc/bcm-vk/Kconfig ***
#-
@@ -6475,11 +6517,6 @@ MISC_RTSX_USB all=m
CB710_CORE all=m
CB710_DEBUG all=n
-#-
-#- *** FILE: drivers/misc/echo/Kconfig ***
-#-
-ECHO all=m
-
#-
#- *** FILE: drivers/misc/eeprom/Kconfig ***
#-
@@ -6890,6 +6927,7 @@ BONDING all=m
DUMMY all=m
WIREGUARD all=m
WIREGUARD_DEBUG all=n
+OVPN all=m
EQUALIZER all=m
NET_FC all=y
IFB all=m
@@ -7663,12 +7701,18 @@ HIBMCGE all=m
#-
NET_VENDOR_HUAWEI all=y
#- file drivers/net/ethernet/huawei/hinic/Kconfig goes here
+#- file drivers/net/ethernet/huawei/hinic3/Kconfig goes here
#-
#- *** FILE: drivers/net/ethernet/huawei/hinic/Kconfig ***
#-
HINIC all=m
+#-
+#- *** FILE: drivers/net/ethernet/huawei/hinic3/Kconfig ***
+#-
+HINIC3 all=m
+
#-
#- *** FILE: drivers/net/ethernet/i825xx/Kconfig ***
#-
@@ -8254,7 +8298,6 @@ MCTP_TRANSPORT_USB all=m
#-
#- *** FILE: drivers/net/mdio/Kconfig ***
#-
-MDIO_DEVICE arm=y arm64=y
MDIO_BITBANG all=m
MDIO_BCM_UNIMAC all=m
MDIO_CAVIUM all=m
@@ -8286,6 +8329,7 @@ LED_TRIGGER_PHY all=y
FIXED_PHY all=y
SFP all=m
#- MII PHY device drivers
+AS21XXX_PHY all=m
AIR_EN8811H_PHY all=m
AMD_PHY all=m
MESON_GXL_PHY arm64=m
@@ -8311,6 +8355,7 @@ MARVELL_10G_PHY all=m
MARVELL_88Q2XXX_PHY all=m
MARVELL_88X2222_PHY all=m
MAXLINEAR_GPHY all=m
+MAXLINEAR_86110_PHY all=m
#- file drivers/net/phy/mediatek/Kconfig goes here
MICREL_PHY all=m
MICROCHIP_T1S_PHY all=m
@@ -8577,6 +8622,7 @@ ATH11K_TRACING all=n
#- *** FILE: drivers/net/wireless/ath/ath12k/Kconfig ***
#-
ATH12K all=m
+ATH12K_AHB all=y
ATH12K_DEBUG all=n
ATH12K_TRACING all=n
ATH12K_COREDUMP all=n
@@ -9440,7 +9486,7 @@ PCIE_EDR all=y
#-
#- *** FILE: drivers/pci/pwrctrl/Kconfig ***
#-
-PCI_PWRCTL_SLOT all=m
+PCI_PWRCTRL_SLOT all=m
#-
#- *** FILE: drivers/pci/switch/Kconfig ***
@@ -9833,6 +9879,7 @@ GOLDFISH_PIPE all=m
#-
MELLANOX_PLATFORM all=y
MLX_PLATFORM all=m
+MLXREG_DPU all=m
MLXREG_HOTPLUG all=m
MLXREG_IO all=m
MLXREG_LC all=m
@@ -9922,6 +9969,7 @@ MSI_WMI all=m
MSI_WMI_PLATFORM all=m
XO15_EBOOK all=m
PCENGINES_APU2 all=m
+PORTWELL_EC all=m
BARCO_P50_GPIO all=m
SAMSUNG_GALAXYBOOK all=m
SAMSUNG_LAPTOP all=m
@@ -9941,6 +9989,7 @@ TOPSTAR_LAPTOP all=m
SERIAL_MULTI_INSTANTIATE x86=m
INSPUR_PLATFORM_PROFILE all=m
LENOVO_WMI_CAMERA all=m
+DASHARO_ACPI all=m
#- file drivers/platform/x86/x86-android-tablets/Kconfig goes here
INTEL_IPS all=m
INTEL_SCU_IPC i386=y
@@ -9951,6 +10000,8 @@ INTEL_SCU_IPC_UTIL all=m
SILICOM_PLATFORM all=m
WINMATE_FM07_KEYS all=m
SEL3350_PLATFORM all=m
+OXP_EC all=m
+#- file drivers/platform/x86/tuxedo/Kconfig goes here
#-
#- *** FILE: drivers/platform/x86/amd/Kconfig ***
@@ -9960,6 +10011,7 @@ SEL3350_PLATFORM all=m
#- file drivers/platform/x86/amd/pmc/Kconfig goes here
AMD_3D_VCACHE all=m
AMD_WBRF all=y
+AMD_ISP_PLATFORM all=m
#-
#- *** FILE: drivers/platform/x86/amd/hsmp/Kconfig ***
@@ -10107,6 +10159,11 @@ SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE all=m
SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE all=m
SIEMENS_SIMATIC_IPC_BATT_F7188X all=m
+#-
+#- *** FILE: drivers/platform/x86/tuxedo/nb04/Kconfig ***
+#-
+TUXEDO_NB04_WMI_AB all=m
+
#-
#- *** FILE: drivers/platform/x86/x86-android-tablets/Kconfig ***
#-
@@ -10182,6 +10239,7 @@ POWER_RESET_MT6323 all=y
POWER_RESET_QNAP arm=y
POWER_RESET_REGULATOR all=y
POWER_RESET_RESTART all=n
+POWER_RESET_TORADEX_EC all=m
POWER_RESET_TPS65086 all=y
POWER_RESET_VERSATILE arm=n
POWER_RESET_VEXPRESS arm64=y
@@ -10213,6 +10271,7 @@ WM8350_POWER all=m
TEST_POWER all=m
CHARGER_ADP5061 all=m
BATTERY_ACT8945A all=m
+BATTERY_CHAGALL all=m
BATTERY_CPCAP all=m
BATTERY_CW2015 all=m
BATTERY_DS2760 all=m
@@ -10256,6 +10315,7 @@ CHARGER_MAX77650 all=m
CHARGER_MAX77693 all=m
CHARGER_MAX77705 all=m
CHARGER_MAX77976 all=m
+CHARGER_MAX8971 all=m
CHARGER_MP2629 all=m
CHARGER_MT6360 all=m
CHARGER_MT6370 all=m
@@ -10425,6 +10485,7 @@ REGULATOR_88PM800 all=m
REGULATOR_ACT8865 all=m
REGULATOR_ACT8945A all=m
REGULATOR_AD5398 all=m
+REGULATOR_ADP5055 all=m
REGULATOR_ANATOP all=m
REGULATOR_AB8500 all=y
REGULATOR_ARIZONA_LDO1 all=m
@@ -11361,7 +11422,6 @@ VIDEO_ATOMISP all=m
#-
VIDEO_ATOMISP_OV2722 all=m
VIDEO_ATOMISP_GC2235 all=m
-VIDEO_ATOMISP_MT9M114 all=m
VIDEO_ATOMISP_GC0310 all=m
#-
@@ -12004,19 +12064,14 @@ USB_RAW_GADGET all=m
#-
#- *** FILE: drivers/usb/gadget/udc/Kconfig ***
#-
-USB_FUSB300 arm=m x86=m
USB_GR_UDC all=m
USB_R8A66597 all=m
USB_RENESAS_USBHS_UDC all=m
USB_PXA27X all=n
-USB_MV_UDC all=m
-USB_MV_U3D all=m
USB_SNP_UDC_PLAT all=m
USB_M66592 all=m
#- file drivers/usb/gadget/udc/bdc/Kconfig goes here
USB_AMD5536UDC all=m
-USB_NET2272 all=m
-USB_NET2272_DMA all=y
USB_NET2280 all=m
USB_GOKU all=m
USB_EG20T all=m
@@ -12046,6 +12101,7 @@ USB_XHCI_DBGCAP all=n
USB_XHCI_PCI_RENESAS all=m
USB_XHCI_PLATFORM all=m
USB_XHCI_MVEBU arm=m
+USB_XHCI_SIDEBAND all=y
USB_EHCI_HCD all=m
USB_EHCI_ROOT_HUB_TT all=y sparc64=n
USB_EHCI_TT_NEWSCHED all=y
@@ -12154,7 +12210,6 @@ USB_GPIO_VBUS all=m
TAHVO_USB all=m
TAHVO_USB_HOST_BY_DEFAULT all=n
USB_ISP1301 all=m
-USB_MV_OTG all=m
USB_ULPI arm=y arm64=y
#-
@@ -12724,6 +12779,12 @@ VIRTIO_INPUT all=m
VIRTIO_MMIO all=m
VIRTIO_MMIO_CMDLINE_DEVICES all=y
VIRTIO_DEBUG all=y
+VIRTIO_RTC all=m
+#- WARNING: Consider enabling VIRTIO_RTC_PTP and/or VIRTIO_RTC_CLASS.
+#- Enable PTP_1588_CLOCK in order to enable VIRTIO_RTC_PTP.
+VIRTIO_RTC_PTP all=y
+#- Enable RTC_CLASS in order to enable VIRTIO_RTC_CLASS.
+VIRTIO_RTC_CLASS all=y
#-
#- *** FILE: drivers/w1/Kconfig ***
@@ -12839,6 +12900,7 @@ IBMASR i386=m x86_64=m
WAFER_WDT i386=m x86_64=m
I6300ESB_WDT arm=m arm64=m i386=m x86_64=m
IE6XX_WDT all=m
+INTEL_OC_WATCHDOG all=m
ITCO_WDT all=m
ITCO_VENDOR_SUPPORT all=y
IT8712F_WDT all=m
@@ -12989,6 +13051,7 @@ MISC_FILESYSTEMS all=y
#- file fs/hpfs/Kconfig goes here
#- file fs/qnx4/Kconfig goes here
#- file fs/qnx6/Kconfig goes here
+#- file fs/resctrl/Kconfig goes here
#- file fs/romfs/Kconfig goes here
#- file fs/pstore/Kconfig goes here
#- file fs/ufs/Kconfig goes here
@@ -13066,6 +13129,8 @@ BCACHEFS_LOCK_TIME_STATS all=n
BCACHEFS_NO_LATENCY_ACCT all=n
BCACHEFS_SIX_OPTIMISTIC_SPIN all=y
BCACHEFS_PATH_TRACEPOINTS all=n
+BCACHEFS_TRANS_KMALLOC_TRACE all=n
+BCACHEFS_ASYNC_OBJECT_LISTS all=n
#-
#- *** FILE: fs/befs/Kconfig ***
@@ -13162,6 +13227,7 @@ EROFS_FS_ZIP all=y
EROFS_FS_ZIP_LZMA all=y
EROFS_FS_ZIP_DEFLATE all=y
EROFS_FS_ZIP_ZSTD all=y
+EROFS_FS_ZIP_ACCEL all=y
EROFS_FS_ONDEMAND all=y
EROFS_FS_PCPU_KTHREAD all=y
EROFS_FS_PCPU_KTHREAD_HIPRI all=y
@@ -13550,6 +13616,7 @@ SQUASHFS_DECOMP_MULTI all=y
SQUASHFS_DECOMP_MULTI_PERCPU all=y
SQUASHFS_CHOICE_DECOMP_BY_MOUNT all=y
SQUASHFS_XATTR all=y
+SQUASHFS_COMP_CACHE_FULL all=y
SQUASHFS_ZLIB all=y
SQUASHFS_LZ4 all=y
SQUASHFS_LZO all=y
@@ -13652,7 +13719,6 @@ SYSVIPC_SYSCTL all=y
POSIX_MQUEUE all=y
WATCH_QUEUE all=y
CROSS_MEMORY_ATTACH all=y
-USELIB all=y
AUDIT all=y
AUDITSYSCALL all=y
#- file kernel/irq/Kconfig goes here
@@ -13772,6 +13838,7 @@ HZ all=300 alpha=1024
KEXEC arm=y arm64=y powerpc=y x86=y
KEXEC_FILE all=y
KEXEC_SIG all=n
+KEXEC_HANDOVER all=y
CRASH_DUMP arm=n arm64=n powerpc=n x86=n
#-
@@ -14302,6 +14369,14 @@ CRYPTO_LIB_CHACHA all=m
CRYPTO_LIB_CURVE25519 all=m
CRYPTO_LIB_POLY1305 all=m
CRYPTO_LIB_CHACHA20POLY1305 all=m
+#- file arch/arm/lib/crypto/Kconfig goes here
+#- file arch/arm64/lib/crypto/Kconfig goes here
+#- file arch/mips/lib/crypto/Kconfig goes here
+#- file arch/powerpc/lib/crypto/Kconfig goes here
+#- file arch/riscv/lib/crypto/Kconfig goes here
+#- file arch/s390/lib/crypto/Kconfig goes here
+#- file arch/sparc/lib/crypto/Kconfig goes here
+#- file arch/x86/lib/crypto/Kconfig goes here
#-
#- *** FILE: lib/fonts/Kconfig ***
@@ -14402,6 +14477,7 @@ CMA all=y
CMA_DEBUGFS all=n
CMA_SYSFS all=y
CMA_AREAS all=7
+PAGE_BLOCK_ORDER all=10
MEM_SOFT_DIRTY all=y
DEFERRED_STRUCT_PAGE_INIT all=n
IDLE_PAGE_TRACKING all=y arm=n
@@ -14511,7 +14587,6 @@ BRIDGE_NETFILTER all=m
#- file net/ipv4/netfilter/Kconfig goes here
#- file net/ipv6/netfilter/Kconfig goes here
#- file net/bridge/netfilter/Kconfig goes here
-#- file net/dccp/Kconfig goes here
#- file net/sctp/Kconfig goes here
#- file net/rds/Kconfig goes here
#- file net/tipc/Kconfig goes here
@@ -14742,22 +14817,6 @@ CEPH_LIB_USE_DNS_RESOLVER all=y
#-
DCB all=y
-#-
-#- *** FILE: net/dccp/Kconfig ***
-#-
-IP_DCCP all=m
-INET_DCCP_DIAG all=m
-#- file net/dccp/ccids/Kconfig goes here
-IP_DCCP_DEBUG all=n
-
-#-
-#- *** FILE: net/dccp/ccids/Kconfig ***
-#-
-IP_DCCP_CCID2_DEBUG all=n
-IP_DCCP_CCID3 all=y
-IP_DCCP_CCID3_DEBUG all=n
-IP_DCCP_TFRC_LIB all=y
-
#-
#- *** FILE: net/dns_resolver/Kconfig ***
#-
@@ -15351,6 +15410,7 @@ AF_RXRPC_INJECT_LOSS all=n
AF_RXRPC_INJECT_RX_DELAY all=y
AF_RXRPC_DEBUG all=n
RXKAD all=y
+RXGK all=y
RXPERF all=m
#-
@@ -15599,12 +15659,8 @@ LSM all="landlock,lockdown,yama,loadpin,safesetid,ipe,bpf"
#-
#- *** FILE: security/Kconfig.hardening ***
#-
-GCC_PLUGIN_STRUCTLEAK all=y
INIT_STACK_NONE all=n
-GCC_PLUGIN_STRUCTLEAK_USER all=n
-GCC_PLUGIN_STRUCTLEAK_BYREF all=n
INIT_STACK_ALL_PATTERN all=n
-GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n
GCC_PLUGIN_STACKLEAK all=y
STACKLEAK_TRACK_MIN_SIZE all=100
STACKLEAK_METRICS all=y
@@ -16017,6 +16073,7 @@ SND_YMFPCI all=m
#- *** FILE: sound/pci/hda/Kconfig ***
#-
SND_HDA_INTEL all=m sparc=n
+SND_HDA_ACPI all=m
SND_HDA_HWDEP all=y
SND_HDA_RECONFIG all=y
SND_HDA_INPUT_BEEP all=y
@@ -16085,6 +16142,7 @@ SND_PS3_DEFAULT_START_DELAY ppc64=2000
#- *** FILE: sound/soc/Kconfig ***
#-
SND_SOC all=m
+SND_SOC_USB all=m
#- file sound/soc/adi/Kconfig goes here
#- file sound/soc/amd/Kconfig goes here
#- file sound/soc/apple/Kconfig goes here
@@ -16256,6 +16314,7 @@ SND_SOC_CS42XX8_I2C all=m
SND_SOC_CS43130 all=m
SND_SOC_CS4341 all=m
SND_SOC_CS4349 all=m
+SND_SOC_CS48L32 all=m
SND_SOC_CS53L30 all=m
SND_SOC_CS530X_I2C all=m
SND_SOC_CX2072X all=m
@@ -16270,6 +16329,8 @@ SND_SOC_ES8326 all=m
SND_SOC_ES8328 all=m
SND_SOC_ES8328_I2C all=m
SND_SOC_ES8328_SPI all=m
+SND_SOC_ES8375 all=m
+SND_SOC_ES8389 all=m
SND_SOC_FRAMER all=m
SND_SOC_GTM601 all=m
SND_SOC_HDAC_HDMI all=m
@@ -16338,6 +16399,8 @@ SND_SOC_RT722_SDCA_SDW all=m
SND_SOC_RT715_SDW all=m
SND_SOC_RT715_SDCA_SDW all=m
SND_SOC_RT9120 all=m
+SND_SOC_RT9123 all=m
+SND_SOC_RT9123P all=m
SND_SOC_RTQ9128 all=m
SND_SOC_SGTL5000 all=m
SND_SOC_SIMPLE_AMPLIFIER all=m
@@ -16420,6 +16483,7 @@ SND_SOC_WM8974 all=m
SND_SOC_WM8978 all=m
SND_SOC_WM8985 all=m
SND_SOC_WM8991 all=m
+SND_SOC_WM8998 all=m
SND_SOC_WSA881X all=m
SND_SOC_WSA883X all=m
SND_SOC_WSA884X all=m
@@ -16521,6 +16585,7 @@ SND_SOC_INTEL_AVS all=m
#- *** FILE: sound/soc/intel/avs/boards/Kconfig ***
#-
#- Available DSP configurations
+SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE all=n
SND_SOC_INTEL_AVS_MACH_DA7219 all=m
SND_SOC_INTEL_AVS_MACH_DMIC all=m
SND_SOC_INTEL_AVS_MACH_ES8336 all=m
@@ -16732,6 +16797,7 @@ SND_USB_US122L all=m
SND_USB_6FIRE all=m
SND_USB_HIFACE all=m
SND_BCD2000 all=m
+SND_USB_AUDIO_QMI all=m
#- file sound/usb/line6/Kconfig goes here
#-
@@ -16776,6 +16842,7 @@ RD_ZSTD all=y
ADIS16240 all=m
ARCX_ANYBUS_CONTROLLER arm=m arm64=m
BACKLIGHT_PCF50633 all=m
+BT_HCIBTUSB_AUTO_ISOC_ALT all=y
CHARGER_PCF50633 all=m
CPU5_WDT i386=m x86_64=m
CRC32_BIT all=n
@@ -16792,7 +16859,15 @@ CRYPTO_CRCT10DIF all=y
CRYPTO_CRCT10DIF_ARM64_CE arm64=m
CRYPTO_CRCT10DIF_ARM_CE arm=m
CRYPTO_CRCT10DIF_PCLMUL all=m
+CRYPTO_DEV_CAVIUM_ZIP arm64=m
CRYPTO_KEYWRAP all=m
+CRYPTO_MANAGER_DISABLE_TESTS all=y
+CRYPTO_POLY1305 all=m
+CRYPTO_SHA256_SSSE3 all=m
+CRYPTO_SHA2_ARM64_CE arm64=m
+CRYPTO_SHA2_ARM_CE arm=m
+CRYPTO_SM3 all=m
+CRYPTO_TEST all=m
CRYPTO_VMAC all=m
DAMON_DBGFS all=y
DAMON_DBGFS_DEPRECATED all=n
@@ -16800,18 +16875,30 @@ DEBUG_TIMEKEEPING all=n
DRM_I2C_CH7006 all=m
DRM_I2C_NXP_TDA9950 all=m
DRM_I2C_SIL164 all=m
+ECHO all=m
EDAC_AMD8111 powerpc=m
EDAC_AMD8131 powerpc=m
EDAC_CELL ppc64=m
FIELDBUS_DEV all=m
+GCC_PLUGIN_STRUCTLEAK all=y
+GCC_PLUGIN_STRUCTLEAK_BYREF all=n
+GCC_PLUGIN_STRUCTLEAK_USER all=n
+GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n
GPIO_LOGICV all=m
HMS_ANYBUSS_BUS arm=m arm64=m
HMS_PROFINET arm=m arm64=m
I2C_AMD756_S4882 all=m sparc=
I2C_COMPAT all=y
I2C_NFORCE2_S4985 all=m
+INET_DCCP_DIAG all=m
INFINIBAND_HNS arm64=m
INPUT_EVBUG all=n
+IP_DCCP all=m
+IP_DCCP_CCID2_DEBUG all=n
+IP_DCCP_CCID3 all=y
+IP_DCCP_CCID3_DEBUG all=n
+IP_DCCP_DEBUG all=n
+IP_DCCP_TFRC_LIB all=y
KALLSYMS_ABSOLUTE_PERCPU all=y
KEYBOARD_MCS all=m
KS7010 all=m
@@ -16819,6 +16906,7 @@ LIB80211 all=m
LIB80211_DEBUG all=n
LIBCRC32C all=m
LTE_GDM724X all=m
+MDIO_DEVICE arm=y arm64=y
MEMORY_HOTPLUG_DEFAULT_ONLINE all=y
MESON_GX_PM_DOMAINS arm64=m
MFD_PCF50633 all=m
@@ -16826,6 +16914,7 @@ MODULE_COMPRESS_NONE all=n
NET_SB1000 all=m
PCF50633_ADC all=m
PCF50633_GPIO all=m
+PCI_PWRCTL_SLOT all=m
R8712U all=m
RADIO_WL128X all=m
REGULATOR_PCF50633 all=m
@@ -16844,6 +16933,8 @@ RTLLIB_CRYPTO_TKIP all=m
RTLLIB_CRYPTO_WEP all=m
RTS5208 all=m
SCHED_DEBUG all=n
+SENSORS_OXP all=m
+SENSORS_SBRMI all=m
SERIAL_KGDB_NMI all=n
SERIAL_SIFIV all=m
SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
@@ -16873,6 +16964,7 @@ SND_SOC_INTEL_SST all=m
SND_VERBOSE_PRINTK all=n
SPIDER_NET ppc64=m
SPLIT_PTLOCK_CPUS all=4
+STA2X11_VIP all=m
SUNDANCE all=m
SUNDANCE_MMIO all=n sparc=y sparc64=y
SYSV_FS all=m
@@ -16885,8 +16977,16 @@ TOUCHSCREEN_CYTTSP4_I2C all=m
TOUCHSCREEN_CYTTSP4_SPI all=m
TOUCHSCREEN_MCS5000 all=m
UNICODE_NORMALIZATION_SELFTEST all=m
+USB_FUSB300 arm=m x86=m
+USB_MV_OTG all=m
+USB_MV_U3D all=m
+USB_MV_UDC all=m
+USB_NET2272 all=m
+USB_NET2272_DMA all=y
+USELIB all=y
VFIO_PCI_MMAP all=y
VIDEO_ATOMISP_MSRLIST_HELPER all=m
+VIDEO_ATOMISP_MT9M114 all=m
VT6655 all=m
VT6656 all=m
XILINX_INT all=y
diff --git a/kernel-x86.config b/kernel-x86.config
index 5bc2c429..aa996fe1 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -9,21 +9,18 @@ X86_POSTED_MSI x86_64=y
X86_MPPARSE x86=y
X86_CPU_RESCTRL all=y
X86_FRED x86_64=y
-X86_BIGSMP i386=y
X86_EXTENDED_PLATFORM i386=y x86_64=y
X86_NUMACHIP all=n
X86_VSMP x86_64=n
X86_UV i386=n x86_64=n
-X86_GOLDFISH all=n
X86_INTEL_MID all=n
+X86_GOLDFISH all=n
X86_INTEL_QUARK i386=y
+X86_RDC321X i386=n
X86_INTEL_LPSS all=y
X86_AMD_PLATFORM_DEVICE all=y
IOSF_MBI all=y
IOSF_MBI_DEBUG all=y
-X86_RDC321X i386=n
-X86_32_NON_STANDARD i386=y
-STA2X11 all=y
X86_32_IRIS i486=y i586=y i686=y
SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
HYPERVISOR_GUEST all=y
@@ -67,11 +64,8 @@ MICROCODE all=y
MICROCODE_LATE_LOADING x86=n
X86_MSR x86=m
X86_CPUID x86=m
-NOHIGHMEM i386=n
HIGHMEM4G i386=y
-HIGHMEM64G i386=n
PAGE_OFFSET i386=0xC0000000
-X86_5LEVEL x86=n
X86_CPA_STATISTICS x86=y
AMD_MEM_ENCRYPT x86=y
NUMA x86_64=y
@@ -79,7 +73,6 @@ AMD_NUMA x86=n
X86_64_ACPI_NUMA x86_64=y
NODES_SHIFT x86_64=6
X86_PMEM_LEGACY x86=y
-HIGHPTE i386=n
X86_CHECK_BIOS_CORRUPTION x86=y
X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK x86=y
MATH_EMULATION i386=y i686=n pentium3=n pentium4=n athlon=n
@@ -135,6 +128,7 @@ MITIGATION_SPECTRE_V2 x86=y x86_64=y
MITIGATION_SRBDS x86=y x86_64=y
MITIGATION_SSB x86=y x86_64=y
MITIGATION_ITS x86=y x86_64=y
+MITIGATION_TSA x86=y
#- file kernel/power/Kconfig goes here
#- file drivers/acpi/Kconfig goes here
APM i386=m
@@ -161,6 +155,7 @@ GEOS i486=y i586=y i686=y
IA32_EMULATION x86_64=y
X86_X32_ABI all=y
#- file arch/x86/kvm/Kconfig goes here
+#- file arch/x86/Kconfig.cpufeatures goes here
#- file arch/x86/Kconfig.assembler goes here
#-
@@ -178,7 +173,6 @@ MPENTIUMM i386=n
MPENTIUM4 i386=n pentium4=y
MK6 i386=n
MK7 i386=n athlon=y
-MK8 i386=n x86_64=n amd64=y
MCRUSOE i386=n
MEFFICEON i386=n
MWINCHIPC6 i386=n
@@ -189,10 +183,8 @@ MGEODE_LX i386=n
MCYRIXIII i386=n
MVIAC3_2 i386=n
MVIAC7 i386=n
-MPSC x86_64=n
-MCORE2 x86=n
MATOM x86=n
-GENERIC_CPU x86_64=y amd64=n
+X86_NATIVE_CPU x86=n
X86_GENERIC i386=y i586=n i686=n pentium3=n pentium4=n athlon=n
PROCESSOR_SELECT x86=y
CPU_SUP_INTEL x86=y
@@ -272,9 +264,20 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT x86=y
BOOTPARAM_HOTPLUG_CPU0 all=n
DEBUG_HOTPLUG_CPU0 all=n
+GENERIC_CPU x86_64=y amd64=n
+HIGHMEM64G i386=n
+HIGHPTE i386=n
KEXEC_JUMP x86=y
+MCORE2 x86=n
MICROCODE_AMD x86=y
MICROCODE_INTEL x86=y
MITIGATION_GDS_FORCE x86_64=n x86=n
+MK8 i386=n x86_64=n amd64=y
+MPSC x86_64=n
+NOHIGHMEM i386=n
NUMA_EMU x86_64=n
SPECULATION_MITIGATIONS x86=y
+STA2X11 all=y
+X86_32_NON_STANDARD i386=y
+X86_5LEVEL x86=n
+X86_BIGSMP i386=y
diff --git a/update-source.sh b/update-source.sh
index 65104891..ba497954 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -1,8 +1,8 @@
#!/bin/sh
set -xe
-BRANCH=aufs6.15
-#BRANCH=aufs6.x-rcN
+#BRANCH=aufs6.16
+BRANCH=aufs6.x-rcN
# aufs6
[ -d aufs-standalone ] || git clone https://github.com/sfjro/aufs-standalone.git
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/adfa13391d26805c1ebf581396e69b8c97a81aab
More information about the pld-cvs-commit
mailing list