[packages/kernel] Up to 6.1.0.
arekm
arekm at pld-linux.org
Sat Dec 17 10:17:35 CET 2022
commit 2255d0fe9422b0018d3009c812d011f6fb781b56
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Dec 17 10:17:13 2022 +0100
Up to 6.1.0.
kernel-aufs.patch | 355 +++++++++++++++++++----------------
kernel-multiarch.config | 489 ++++++++++++++++++++++++++++--------------------
kernel.spec | 7 +-
update-source.sh | 4 +-
4 files changed, 485 insertions(+), 370 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ea86de74..d61e87ac 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
%endif
%define rel 1
-%define basever 6.0
-%define postver .10
+%define basever 6.1
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -118,7 +118,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: d681bd1d62d48049a4874646f6774d92
+# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
# Patch0-md5: b3c6eed24d72560fe68ed5c52f73e8ef
@@ -704,6 +704,7 @@ find -name '*.py' -print0 | \
drivers/staging/greybus/tools/lbtest \
scripts/bloat-o-meter \
scripts/diffconfig \
+ scripts/dtc/dt-extract-compatibles \
scripts/jobserver-exec \
scripts/show_delta \
tools/hv/vmbus_testing \
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index ceaa2607..7e799343 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0
-aufs6.0 kbuild patch
+aufs6.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index a547307c1ae8..919ca5404804 100644
+index 2685a4d0d353..a2df3d4bb3aa 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -318,6 +318,7 @@ source "fs/sysv/Kconfig"
+@@ -319,6 +319,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig"
@@ -14,22 +14,22 @@ index a547307c1ae8..919ca5404804 100644
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index 93b80529f8e8..a26c58d09435 100644
+index 4dea17840761..9795cbfdd0bf 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -138,3 +138,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+@@ -137,3 +137,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_ZONEFS_FS) += zonefs/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs6.0 base patch
+aufs6.x-rcN base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 72b9654f764c..53fc0e89d1ea 100644
+index 379945f82a64..b3b8fbca497b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3425,6 +3425,19 @@ F: include/uapi/linux/audit.h
+@@ -3455,6 +3455,19 @@ F: include/uapi/linux/audit.h
F: kernel/audit*
F: lib/*audit.c
@@ -79,7 +79,7 @@ index ad92192c7d61..8ca56da3ca69 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c
-index bb0c4d0038db..d753ad7d77e6 100644
+index 52e6d5fdab6b..519321f32f95 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1345,7 +1345,7 @@ enum d_walk_ret {
@@ -159,7 +159,7 @@ index 0878b852b355..d83f9e5cddbc 100644
unsigned int p_space;
int ret;
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 9eced4cc286e..9c5a33fce3a8 100644
+index e654435f1651..433a4f08dab4 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1364,6 +1364,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -170,7 +170,7 @@ index 9eced4cc286e..9c5a33fce3a8 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp);
-@@ -2115,6 +2116,7 @@ struct file_operations {
+@@ -2117,6 +2118,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
@@ -227,7 +227,7 @@ index a55179fd60fc..8e21c53cf883 100644
+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 64a13eb56078..c9f30e12aa32 100644
+index e3375bc40dad..c1f0aadde539 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -217,7 +217,7 @@ unsigned long max_lock_class_idx;
@@ -248,10 +248,10 @@ index 64a13eb56078..c9f30e12aa32 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.0 mmap patch
+aufs6.x-rcN mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 93f7e3d971e4..23aa1626020a 100644
+index 9e479d7d202b..986c2ae12f8b 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2218,7 +2218,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -280,10 +280,10 @@ index 4d3493579458..42edd9a42c78 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 4e0023643f8b..09394cf6e349 100644
+index 8a74cdcc9af0..c05071b53f5b 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
-@@ -281,7 +281,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+@@ -284,7 +284,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
const char *name = NULL;
if (file) {
@@ -295,7 +295,7 @@ index 4e0023643f8b..09394cf6e349 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1912,7 +1915,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1934,7 +1937,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;
@@ -305,10 +305,10 @@ index 4e0023643f8b..09394cf6e349 100644
struct mempolicy *pol;
char buffer[64];
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index a6d21fc0033c..02c2de31196e 100644
+index 2fd06f52b6a4..b01030da424f 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
-@@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
+@@ -150,7 +150,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
file = vma->vm_file;
if (file) {
@@ -321,10 +321,10 @@ index a6d21fc0033c..02c2de31196e 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 21f8b27bd9fd..de9572fe212b 100644
+index 8bbcccbc5565..d5006a1f4271 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -1858,6 +1858,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1933,6 +1933,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@@ -369,10 +369,10 @@ index 21f8b27bd9fd..de9572fe212b 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 cf97f3884fda..a783130a669d 100644
+index 500e536796ca..ad766e2110ca 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
-@@ -372,6 +372,9 @@ struct vm_region {
+@@ -413,6 +413,9 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */
@@ -382,7 +382,7 @@ index cf97f3884fda..a783130a669d 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
-@@ -468,6 +471,9 @@ struct vm_area_struct {
+@@ -494,6 +497,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). */
@@ -393,10 +393,10 @@ index cf97f3884fda..a783130a669d 100644
#ifdef CONFIG_SWAP
diff --git a/kernel/fork.c b/kernel/fork.c
-index 2b6bd511c6ed..944adfb5189a 100644
+index 08969f5aa38d..61871700033a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -662,7 +662,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -661,7 +661,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
if (file) {
struct address_space *mapping = file->f_mapping;
@@ -406,19 +406,19 @@ index 2b6bd511c6ed..944adfb5189a 100644
if (tmp->vm_flags & VM_SHARED)
mapping_allow_writable(mapping);
diff --git a/mm/Makefile b/mm/Makefile
-index 9a564f836403..86a4be7f34a8 100644
+index 8e105e5b3e29..c218d042dbce 100644
--- a/mm/Makefile
+++ b/mm/Makefile
-@@ -134,3 +134,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
+@@ -138,3 +138,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o
obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
+obj-$(CONFIG_AUFS_FS:m=y) += prfile.o
diff --git a/mm/filemap.c b/mm/filemap.c
-index 15800334147b..2c22abb4a14d 100644
+index 08341616ae7a..410ca60fbf39 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -3403,7 +3403,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -3418,7 +3418,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);
@@ -428,10 +428,10 @@ index 15800334147b..2c22abb4a14d 100644
if (folio->mapping != mapping) {
folio_unlock(folio);
diff --git a/mm/mmap.c b/mm/mmap.c
-index 9d780f415be3..e744ba276454 100644
+index 2def55555e05..fefc5c67e96e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
-@@ -142,7 +142,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -139,7 +139,7 @@ static void remove_vma(struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -439,8 +439,8 @@ index 9d780f415be3..e744ba276454 100644
+ vma_fput(vma);
mpol_put(vma_policy(vma));
vm_area_free(vma);
- return next;
-@@ -911,7 +911,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+ }
+@@ -590,7 +590,7 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma,
if (remove_next) {
if (file) {
uprobe_munmap(next, next->vm_start, next->vm_end);
@@ -449,16 +449,16 @@ index 9d780f415be3..e744ba276454 100644
}
if (next->anon_vma)
anon_vma_merge(vma, next);
-@@ -1845,7 +1845,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
- if (vma->vm_ops && vma->vm_ops->close)
- vma->vm_ops->close(vma);
- unmap_and_free_vma:
-- fput(vma->vm_file);
-+ vma_fput(vma);
- vma->vm_file = NULL;
-
- /* Undo any partial mapping done by a device driver. */
-@@ -2705,7 +2705,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -831,7 +831,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
+ again:
+ if (file) {
+ uprobe_munmap(next, next->vm_start, next->vm_end);
+- fput(file);
++ vma_fput(vma);
+ }
+ if (next->anon_vma)
+ anon_vma_merge(vma, next);
+@@ -2228,7 +2228,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol;
if (new->vm_file)
@@ -467,7 +467,7 @@ index 9d780f415be3..e744ba276454 100644
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
-@@ -2724,7 +2724,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2250,7 +2250,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new);
if (new->vm_file)
@@ -476,7 +476,16 @@ index 9d780f415be3..e744ba276454 100644
unlink_anon_vmas(new);
out_free_mpol:
mpol_put(vma_policy(new));
-@@ -2897,6 +2897,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2746,7 +2746,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+ if (vma->vm_ops && vma->vm_ops->close)
+ vma->vm_ops->close(vma);
+ unmap_and_free_vma:
+- fput(vma->vm_file);
++ vma_fput(vma);
+ vma->vm_file = NULL;
+
+ /* Undo any partial mapping done by a device driver. */
+@@ -2813,6 +2813,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
unsigned long populate = 0;
unsigned long ret = -EINVAL;
struct file *file;
@@ -486,7 +495,7 @@ index 9d780f415be3..e744ba276454 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -2952,10 +2955,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2871,10 +2874,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
@@ -521,7 +530,7 @@ index 9d780f415be3..e744ba276454 100644
out:
mmap_write_unlock(mm);
if (populate)
-@@ -3229,7 +3256,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3227,7 +3254,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)
@@ -529,12 +538,12 @@ index 9d780f415be3..e744ba276454 100644
+ vma_get_file(new_vma);
if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma);
- vma_link(mm, new_vma, prev, rb_link, rb_parent);
+ if (vma_link(mm, new_vma))
diff --git a/mm/nommu.c b/mm/nommu.c
-index e819cbc21b39..dc7d40fb197f 100644
+index 214c70e1d059..dccbb939d2a9 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
-@@ -524,7 +524,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem);
if (region->vm_file)
@@ -543,7 +552,7 @@ index e819cbc21b39..dc7d40fb197f 100644
/* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */
-@@ -656,7 +656,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -653,7 +653,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
if (vma->vm_ops && vma->vm_ops->close)
vma->vm_ops->close(vma);
if (vma->vm_file)
@@ -552,7 +561,7 @@ index e819cbc21b39..dc7d40fb197f 100644
put_nommu_region(vma->vm_region);
vm_area_free(vma);
}
-@@ -1176,7 +1176,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1164,7 +1164,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free;
}
}
@@ -561,7 +570,7 @@ index e819cbc21b39..dc7d40fb197f 100644
kmem_cache_free(vm_region_jar, region);
region = pregion;
result = start;
-@@ -1253,10 +1253,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1241,10 +1241,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem);
error:
if (region->vm_file)
@@ -667,10 +676,10 @@ index 000000000000..8f820a235364
+}
+#endif /* !CONFIG_MMU */
SPDX-License-Identifier: GPL-2.0
-aufs6.0 standalone patch
+aufs6.x-rcN standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
-index d753ad7d77e6..1a3b40ebc12b 100644
+index 519321f32f95..267e0c65914a 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data,
@@ -681,7 +690,7 @@ index d753ad7d77e6..1a3b40ebc12b 100644
struct check_mount {
struct vfsmount *mnt;
-@@ -3061,6 +3062,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -3052,6 +3053,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock);
}
@@ -690,10 +699,10 @@ index d753ad7d77e6..1a3b40ebc12b 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index d046dbb9cbd0..5b9023e75de0 100644
+index a0b1f0337a62..2038fdb508c9 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -111,6 +111,7 @@ bool path_noexec(const struct path *path)
+@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
@@ -714,7 +723,7 @@ index c980a0524118..40087d11a974 100644
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
diff --git a/fs/file_table.c b/fs/file_table.c
-index 99c6796c9f28..ad533dcedfec 100644
+index dd88701e54a9..ecdb7817b074 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -198,6 +198,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@@ -766,7 +775,7 @@ index 1de6631a3925..3008eb37a18d 100644
/*
* Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c
-index cf7e5c350a54..c99195ee46ba 100644
+index a81319b6177f..50bb15ea3fb5 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry,
@@ -818,10 +827,10 @@ index d83f9e5cddbc..ac355ebeb9f0 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/fs/xattr.c b/fs/xattr.c
-index a1f4998bc6be..284d4ca54893 100644
+index 61107b6bbed2..243855024966 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
-@@ -396,6 +396,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
+@@ -392,6 +392,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
*xattr_value = value;
return error;
}
@@ -830,7 +839,7 @@ index a1f4998bc6be..284d4ca54893 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 c9f30e12aa32..d04fedf1e4d9 100644
+index c1f0aadde539..278e0a322d20 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -238,6 +238,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -842,19 +851,19 @@ index c9f30e12aa32..d04fedf1e4d9 100644
#ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c
-index dff75bcde151..30b814618535 100644
+index 065e1ef8fc8d..c623c6f0c645 100644
--- a/kernel/task_work.c
+++ b/kernel/task_work.c
-@@ -180,3 +180,4 @@ void task_work_run(void)
+@@ -182,3 +182,4 @@ void task_work_run(void)
} while (work);
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c
-index 4b95de24bc8d..139e1443c49b 100644
+index 79d82cb6e469..1c50e6faadcd 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -1165,6 +1165,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -1167,6 +1167,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
}
@@ -862,7 +871,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry)
{
-@@ -1181,6 +1182,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -1183,6 +1184,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name);
}
@@ -870,7 +879,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry)
-@@ -1189,6 +1191,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -1191,6 +1193,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
}
@@ -878,7 +887,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry,
-@@ -1209,6 +1212,7 @@ int security_path_truncate(const struct path *path)
+@@ -1211,6 +1214,7 @@ int security_path_truncate(const struct path *path)
return 0;
return call_int_hook(path_truncate, 0, path);
}
@@ -886,7 +895,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_chmod(const struct path *path, umode_t mode)
{
-@@ -1216,6 +1220,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -1218,6 +1222,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0;
return call_int_hook(path_chmod, 0, path, mode);
}
@@ -894,7 +903,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{
-@@ -1223,6 +1228,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -1225,6 +1230,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0;
return call_int_hook(path_chown, 0, path, uid, gid);
}
@@ -902,7 +911,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_path_chroot(const struct path *path)
{
-@@ -1323,6 +1329,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -1325,6 +1331,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return call_int_hook(inode_permission, 0, inode, mask);
}
@@ -910,7 +919,7 @@ index 4b95de24bc8d..139e1443c49b 100644
int security_inode_setattr(struct user_namespace *mnt_userns,
struct dentry *dentry, struct iattr *attr)
-@@ -1521,6 +1528,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -1523,6 +1530,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@@ -9123,8 +9132,8 @@ 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 2022-11-05 23:02:18.962555950 +0100
-@@ -0,0 +1,269 @@
++++ linux/fs/aufs/dentry.h 2022-12-17 09:21:34.796521861 +0100
+@@ -0,0 +1,270 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -9168,6 +9177,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+ aufs_bindex_t di_btop, di_bbot, di_bwh, di_bdiropq;
+ unsigned char di_tmpfile; /* to allow the different name */
+ struct au_hdentry *di_hdentry;
++ struct file *di_htmpfile;
+ struct rcu_head rcu;
+} ____cacheline_aligned_in_smp;
+
@@ -9396,8 +9406,8 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+#endif /* __AUFS_DENTRY_H__ */
diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
--- /usr/share/empty/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c 2022-11-05 23:02:18.962555950 +0100
-@@ -0,0 +1,554 @@
++++ linux/fs/aufs/dinfo.c 2022-12-17 09:21:34.796521861 +0100
+@@ -0,0 +1,555 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -9451,6 +9461,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+ dinfo->di_tmpfile = 0;
+ for (i = 0; i < nbr; i++)
+ dinfo->di_hdentry[i].hd_id = -1;
++ dinfo->di_htmpfile = NULL;
+ goto out;
+ }
+
@@ -9954,7 +9965,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 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dir.c 2022-12-17 09:21:34.796521861 +0100
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -10507,9 +10518,9 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+ aufs_bindex_t bindex;
+};
+
-+static int test_empty_cb(struct dir_context *ctx, const char *__name,
-+ int namelen, loff_t offset __maybe_unused, u64 ino,
-+ unsigned int d_type)
++static bool test_empty_cb(struct dir_context *ctx, const char *__name,
++ int namelen, loff_t offset __maybe_unused, u64 ino,
++ unsigned int d_type)
+{
+ struct test_empty_arg *arg = container_of(ctx, struct test_empty_arg,
+ ctx);
@@ -10540,7 +10551,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+out:
+ /* smp_mb(); */
+ AuTraceErr(arg->err);
-+ return arg->err;
++ return !arg->err;
+}
+
+static int do_test_empty(struct dentry *dentry, struct test_empty_arg *arg)
@@ -12775,7 +12786,7 @@ 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 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/export.c 2022-12-17 09:21:34.796521861 +0100
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -13125,7 +13136,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+ int namelen;
+};
+
-+static int
++static bool
+find_name_by_ino(struct dir_context *ctx, const char *name, int namelen,
+ loff_t offset, u64 ino, unsigned int d_type)
+{
@@ -13134,12 +13145,12 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+
+ a->called++;
+ if (a->ino != ino)
-+ return 0;
++ return true;
+
+ memcpy(a->name, name, namelen);
+ a->namelen = namelen;
+ a->found = 1;
-+ return 1;
++ return false;
+}
+
+static struct dentry *au_lkup_by_ino(struct path *path, ino_t ino,
@@ -14039,8 +14050,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 2022-11-05 23:02:18.965889284 +0100
-@@ -0,0 +1,858 @@
++++ linux/fs/aufs/file.c 2022-12-17 09:21:34.799855195 +0100
+@@ -0,0 +1,860 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -14287,18 +14298,20 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+ AuDebugOn(IS_ERR_OR_NULL(dentry));
+ di_write_lock_child(dentry);
+ err = au_cmoo(dentry);
-+ di_downgrade_lock(dentry, AuLock_IR);
+ if (!err) {
-+ if (!aopen)
-+ err = args->open(file, vfsub_file_flags(file), NULL);
-+ else {
++ if (!aopen) {
++ err = args->open(file, vfsub_file_flags(file),
++ au_di(dentry)->di_htmpfile);
++ di_write_unlock(dentry);
++ } else {
++ di_downgrade_lock(dentry, AuLock_IR);
+ lockdep_off();
+ err = args->open(file, vfsub_file_flags(file),
+ args->h_file);
+ lockdep_on();
++ di_read_unlock(dentry, AuLock_IR);
+ }
+ }
-+ di_read_unlock(dentry, AuLock_IR);
+
+ finfo = au_fi(file);
+ if (!err) {
@@ -15400,8 +15413,8 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2022-11-05 23:02:18.962555950 +0100
-@@ -0,0 +1,771 @@
++++ linux/fs/aufs/f_op.c 2022-12-17 09:21:34.799855195 +0100
+@@ -0,0 +1,776 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -15465,12 +15478,17 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+ /* br ref is already inc-ed */
+ }
+
-+ if ((flags & __O_TMPFILE)
-+ && !(flags & O_EXCL)) {
-+ h_inode = file_inode(h_file);
-+ spin_lock(&h_inode->i_lock);
-+ h_inode->i_state |= I_LINKABLE;
-+ spin_unlock(&h_inode->i_lock);
++ if (flags & __O_TMPFILE) {
++ AuDebugOn(!h_file);
++ AuDebugOn(h_file != au_di(dentry)->di_htmpfile);
++ au_di(dentry)->di_htmpfile = NULL;
++
++ if (!(flags & O_EXCL)) {
++ h_inode = file_inode(h_file);
++ spin_lock(&h_inode->i_lock);
++ h_inode->i_state |= I_LINKABLE;
++ spin_unlock(&h_inode->i_lock);
++ }
+ }
+ au_set_fbtop(file, bindex);
+ au_set_h_fptr(file, bindex, h_file);
@@ -19797,7 +19815,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 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/inode.h 2022-12-17 09:21:34.799855195 +0100
@@ -0,0 +1,705 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -20026,7 +20044,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+int au_aopen_or_create(struct inode *dir, struct dentry *dentry,
+ struct vfsub_aopen_args *args);
+int aufs_tmpfile(struct user_namespace *userns, struct inode *dir,
-+ struct dentry *dentry, umode_t mode);
++ struct file *file, umode_t mode);
+int aufs_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry);
+int aufs_mkdir(struct user_namespace *userns, struct inode *dir,
@@ -20141,7 +20159,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+ union {
+ struct {
+ const char *name;
-+ void *value;
++ const void *value;
+ size_t size;
+ int flags;
+ } set;
@@ -20730,8 +20748,8 @@ 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 2022-11-05 23:02:18.965889284 +0100
-@@ -0,0 +1,941 @@
++++ linux/fs/aufs/i_op_add.c 2022-12-17 09:21:34.799855195 +0100
+@@ -0,0 +1,972 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -21152,15 +21170,18 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
+
+int aufs_tmpfile(struct user_namespace *userns, struct inode *dir,
-+ struct dentry *dentry, umode_t mode)
++ struct file *file, umode_t mode)
+{
+ int err;
+ aufs_bindex_t bindex;
++ struct path h_ppath;
+ struct super_block *sb;
-+ struct dentry *parent, *h_parent, *h_dentry;
++ struct au_branch *br;
++ struct dentry *dentry, *parent, *h_parent, *h_dentry;
+ struct inode *h_dir, *inode;
+ struct vfsmount *h_mnt;
+ struct user_namespace *h_userns;
++ struct file *h_file;
+ struct au_wr_dir_args wr_dir_args = {
+ .force_btgt = -1,
+ .flags = AuWrDir_TMPFILE
@@ -21169,11 +21190,13 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+ /* copy-up may happen */
+ inode_lock(dir);
+
++ h_file = NULL;
+ sb = dir->i_sb;
+ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM);
+ if (unlikely(err))
+ goto out;
+
++ dentry = file->f_path.dentry;
+ err = au_di_init(dentry);
+ if (unlikely(err))
+ goto out_si;
@@ -21202,19 +21225,25 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+ if (unlikely(!h_dir->i_op->tmpfile))
+ goto out_parent;
+
-+ h_mnt = au_sbr_mnt(sb, bindex);
++ br = au_sbr(sb, bindex);
++ h_mnt = au_br_mnt(br);
+ err = vfsub_mnt_want_write(h_mnt);
+ if (unlikely(err))
+ goto out_parent;
+
+ h_userns = mnt_user_ns(h_mnt);
+ h_parent = au_h_dptr(parent, bindex);
-+ h_dentry = vfs_tmpfile(h_userns, h_parent, mode, /*open_flag*/0);
-+ if (IS_ERR(h_dentry)) {
-+ err = PTR_ERR(h_dentry);
++ h_ppath.mnt = h_mnt;
++ h_ppath.dentry = h_parent;
++ h_file = vfs_tmpfile_open(h_userns, &h_ppath, mode, /*open_flag*/0,
++ /*cred*/NULL);
++ if (IS_ERR(h_file)) {
++ err = PTR_ERR(h_file);
++ h_file = NULL;
+ goto out_mnt;
+ }
+
++ h_dentry = h_file->f_path.dentry;
+ au_set_dbtop(dentry, bindex);
+ au_set_dbbot(dentry, bindex);
+ au_set_h_dptr(dentry, bindex, dget(h_dentry));
@@ -21224,32 +21253,52 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+ au_set_h_dptr(dentry, bindex, NULL);
+ au_set_dbtop(dentry, -1);
+ au_set_dbbot(dentry, -1);
-+ } else {
-+ if (!inode->i_nlink)
-+ set_nlink(inode, 1);
-+ d_tmpfile(dentry, inode);
-+ au_di(dentry)->di_tmpfile = 1;
-+
-+ /* update without i_mutex */
-+ if (au_ibtop(dir) == au_dbtop(dentry))
-+ au_cpup_attr_timesizes(dir);
++ goto out_h_file;
+ }
-+ dput(h_dentry);
+
++ if (!inode->i_nlink)
++ set_nlink(inode, 1);
++ d_tmpfile(file, inode);
++ au_di(dentry)->di_tmpfile = 1;
++ get_file(h_file);
++ au_di(dentry)->di_htmpfile = h_file;
++
++ /* update without i_mutex */
++ if (au_ibtop(dir) == au_dbtop(dentry))
++ au_cpup_attr_timesizes(dir);
++
++out_h_file:
++ fput(h_file);
+out_mnt:
+ vfsub_mnt_drop_write(h_mnt);
+out_parent:
+ di_write_unlock(parent);
+ dput(parent);
+ di_write_unlock(dentry);
-+ if (unlikely(err)) {
-+ au_di_fin(dentry);
-+ dentry->d_fsdata = NULL;
-+ }
++ if (!err)
++ goto out_si;
++ if (h_file)
++ fput(h_file);
++ au_di(dentry)->di_htmpfile = NULL;
++ au_di_fin(dentry);
++ dentry->d_fsdata = NULL;
+out_si:
+ si_read_unlock(sb);
++ if (!err && h_file) {
++ /* finally... */
++ err = finish_open_simple(file, err);
++ if (!err)
++ au_lcnt_inc(&br->br_nfiles);
++ else {
++ fput(h_file);
++ au_di(dentry)->di_htmpfile = NULL;
++ au_di_fin(dentry);
++ dentry->d_fsdata = NULL;
++ }
++ }
+out:
+ inode_unlock(dir);
++ AuTraceErr(err);
+ return err;
+}
+
@@ -29005,7 +29054,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 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/rdu.c 2022-12-17 09:21:34.799855195 +0100
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -29054,8 +29103,8 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+ int err;
+};
+
-+static int au_rdu_fill(struct dir_context *ctx, const char *name, int nlen,
-+ loff_t offset, u64 h_ino, unsigned int d_type)
++static bool au_rdu_fill(struct dir_context *ctx, const char *name, int nlen,
++ loff_t offset, u64 h_ino, unsigned int d_type)
+{
+ int err, len;
+ struct au_rdu_arg *arg = container_of(ctx, struct au_rdu_arg, ctx);
@@ -29096,7 +29145,7 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+
+out:
+ /* AuTraceErr(err); */
-+ return err;
++ return !err;
+}
+
+static int au_rdu_do(struct file *h_file, struct au_rdu_arg *arg)
@@ -32008,7 +32057,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 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/vdir.c 2022-12-17 09:21:34.799855195 +0100
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -32464,7 +32513,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+ int err;
+};
+
-+static int fillvdir(struct dir_context *ctx, const char *__name, int nlen,
++static bool fillvdir(struct dir_context *ctx, const char *__name, int nlen,
+ loff_t offset __maybe_unused, u64 h_ino,
+ unsigned int d_type)
+{
@@ -32515,7 +32564,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+ arg->vdir->vd_jiffy = jiffies;
+ /* smp_mb(); */
+ AuTraceErr(arg->err);
-+ return arg->err;
++ return !arg->err;
+}
+
+static int au_handle_shwh(struct super_block *sb, struct au_vdir *vdir,
@@ -33830,8 +33879,8 @@ 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 2022-11-05 23:02:18.969222617 +0100
-@@ -0,0 +1,362 @@
++++ linux/fs/aufs/vfsub.h 2022-12-17 09:21:34.799855195 +0100
+@@ -0,0 +1,358 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2005-2022 Junjiro R. Okajima
@@ -34163,13 +34212,9 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+
+/* ---------------------------------------------------------------------- */
+
-+/*
-+ * The parameter 'value' is not const since the id in ACL_USER/ACL_GROUP may be
-+ * changed by idmapping.
-+ */
+static inline int vfsub_setxattr(struct user_namespace *userns,
+ struct dentry *dentry, const char *name,
-+ void *value, size_t size, int flags)
++ const void *value, size_t size, int flags)
+{
+ int err;
+
@@ -36666,8 +36711,8 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2022-11-05 23:02:18.972555950 +0100
-@@ -0,0 +1,372 @@
++++ linux/fs/aufs/xattr.c 2022-12-17 09:21:34.799855195 +0100
+@@ -0,0 +1,368 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2014-2022 Junjiro R. Okajima
@@ -36982,7 +37027,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+}
+
+static int au_setxattr(struct dentry *dentry, struct inode *inode,
-+ const char *name, void *value, size_t size,
++ const char *name, const void *value, size_t size,
+ int flags)
+{
+ struct au_sxattr arg = {
@@ -37007,17 +37052,13 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+ return au_getxattr(dentry, inode, name, buffer, size);
+}
+
-+/*
-+ * The prameter 'void *value' of vfs_setxattr() is NOT const, but
-+ * xattr_handler->set() requires const. Is it OK? I don't know.
-+ */
+static int au_xattr_set(const struct xattr_handler *handler,
+ struct user_namespace *userns,
+ struct dentry *dentry, struct inode *inode,
+ const char *name, const void *value, size_t size,
+ int flags)
+{
-+ return au_setxattr(dentry, inode, name, (void *)value, size, flags);
++ return au_setxattr(dentry, inode, name, value, size, flags);
+}
+
+static const struct xattr_handler au_xattr_handler = {
@@ -38972,7 +39013,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 2022-11-05 23:02:18.972555950 +0100
++++ linux/include/uapi/linux/aufs_type.h 2022-12-17 09:21:34.803188528 +0100
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39016,7 +39057,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.0-20221031"
++#define AUFS_VERSION "6.x-rcN-20221107"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39427,7 +39468,7 @@ 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.0 loopback patch
+aufs6.x-rcN loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 8ca56da3ca69..9ac6f67edf09 100644
@@ -39577,10 +39618,10 @@ index 8ca56da3ca69..9ac6f67edf09 100644
static int loop_clr_fd(struct loop_device *lo)
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 5c5641222d67..79504ea71dad 100644
+index 66ddf86a3331..6cbef597d5b9 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
-@@ -304,7 +304,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
+@@ -309,7 +309,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
if (IS_ERR(h_file))
goto out;
@@ -39652,10 +39693,10 @@ index 81922d4faf54..c8a62c267d72 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 9c5a33fce3a8..a3c40bc66852 100644
+index 433a4f08dab4..0b17b7e5ee11 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2253,6 +2253,10 @@ struct super_operations {
+@@ -2257,6 +2257,10 @@ struct super_operations {
struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index ec60ec84..46acc18f 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -8,6 +8,41 @@ ARM_KPROBES_TEST arm=m
ARM_PTDUMP_DEBUGFS arm=n
COMPAT_32BIT_TIME all=y
CPA_DEBUG all=n
+CRYPTO_AEGIS128_AESNI_SSE2 all=m
+CRYPTO_AES_NI_INTEL all=m
+CRYPTO_ARIA_AESNI_AVX_X86_64 all=m
+CRYPTO_BLAKE2S_X86 x86_64=y
+CRYPTO_BLOWFISH_X86_64 all=m
+CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 all=m
+CRYPTO_CAMELLIA_AESNI_AVX_X86_64 all=m
+CRYPTO_CAMELLIA_X86_64 all=m
+CRYPTO_CAST5_AVX_X86_64 all=m
+CRYPTO_CAST6_AVX_X86_64 all=m
+CRYPTO_CHACHA20_X86_64 all=m
+CRYPTO_CRC32C_INTEL all=m
+CRYPTO_CRC32_PCLMUL all=m
+CRYPTO_CRCT10DIF_PCLMUL all=m
+CRYPTO_CURVE25519_X86 all=m
+CRYPTO_DES3_EDE_X86_64 all=m
+CRYPTO_GHASH_CLMUL_NI_INTEL all=m
+CRYPTO_NHPOLY1305_AVX2 all=m
+CRYPTO_NHPOLY1305_SSE2 all=m
+CRYPTO_POLY1305_X86_64 all=m
+CRYPTO_POLYVAL_CLMUL_NI all=m
+CRYPTO_SERPENT_AVX2_X86_64 all=m
+CRYPTO_SERPENT_AVX_X86_64 all=m
+CRYPTO_SERPENT_SSE2_586 all=m
+CRYPTO_SERPENT_SSE2_X86_64 all=m
+CRYPTO_SHA1_SSSE3 all=m
+CRYPTO_SHA256_SSSE3 all=m
+CRYPTO_SHA512_SSSE3 all=m
+CRYPTO_SM3_AVX_X86_64 all=m
+CRYPTO_SM4_AESNI_AVX2_X86_64 all=m
+CRYPTO_SM4_AESNI_AVX_X86_64 all=m
+CRYPTO_TWOFISH_586 i386=m
+CRYPTO_TWOFISH_AVX_X86_64 all=m
+CRYPTO_TWOFISH_X86_64 x86_64=m
+CRYPTO_TWOFISH_X86_64_3WAY all=m
DEBUG_BOOT_PARAMS all=y
DEBUG_EFI arm64=n
DEBUG_ENTRY all=n
@@ -54,6 +89,7 @@ X86_DEBUG_FPU all=n
X86_DECODER_SELFTEST all=n
X86_VERBOSE_BOOTUP all=n
XEN_DOM0 all=y
+XEN_PV_MSR_SAFE all=y
#-
#- *** FILE: block/Kconfig ***
@@ -139,7 +175,6 @@ SYSTEM_BLACKLIST_AUTH_UPDATE all=y
#-
#- file crypto/async_tx/Kconfig goes here
CRYPTO all=y
-#- Crypto core or helper
CRYPTO_FIPS all=y
CRYPTO_ALGAPI all=y
CRYPTO_AEAD all=m
@@ -154,7 +189,6 @@ CRYPTO_PCRYPT all=m
CRYPTO_CRYPTD all=m
CRYPTO_AUTHENC all=m
CRYPTO_TEST all=m
-#- Public-key cryptography
CRYPTO_RSA all=y
CRYPTO_DH all=y
CRYPTO_DH_RFC7919_GROUPS all=y
@@ -163,117 +197,76 @@ CRYPTO_ECDSA all=m
CRYPTO_ECRDSA all=m
CRYPTO_SM2 all=m
CRYPTO_CURVE25519 all=m
-CRYPTO_CURVE25519_X86 all=m
-#- Authenticated Encryption with Associated Data
-CRYPTO_CCM all=m
-CRYPTO_GCM all=m
-CRYPTO_CHACHA20POLY1305 all=m
-CRYPTO_AEGIS128 all=m
-CRYPTO_AEGIS128_SIMD arm=y arm64=y
-CRYPTO_AEGIS128_AESNI_SSE2 all=m
-CRYPTO_SEQIV all=m
-CRYPTO_ECHAINIV all=m
-#- Block modes
+CRYPTO_AES all=y
+CRYPTO_AES_TI all=m
+CRYPTO_ANUBIS all=m
+CRYPTO_ARIA all=m
+CRYPTO_BLOWFISH all=m
+CRYPTO_CAMELLIA all=m
+CRYPTO_CAST5 all=m
+CRYPTO_CAST6 all=m
+CRYPTO_DES all=m
+CRYPTO_FCRYPT all=m
+CRYPTO_KHAZAD all=m
+CRYPTO_SEED all=m
+CRYPTO_SERPENT all=m
+CRYPTO_SM4 all=m
+CRYPTO_SM4_GENERIC all=m
+CRYPTO_TEA all=m
+CRYPTO_TWOFISH all=m
+CRYPTO_TWOFISH_COMMON all=m
+CRYPTO_ADIANTUM all=m
+CRYPTO_ARC4 all=m
+CRYPTO_CHACHA20 all=m
CRYPTO_CBC all=y
CRYPTO_CFB all=m
CRYPTO_CTR all=y
CRYPTO_CTS all=m
CRYPTO_ECB all=m
+CRYPTO_HCTR2 all=m
+CRYPTO_KEYWRAP all=m
CRYPTO_LRW all=m
CRYPTO_OFB all=m
CRYPTO_PCBC all=m
CRYPTO_XTS all=m
-CRYPTO_KEYWRAP all=m
-CRYPTO_NHPOLY1305_SSE2 all=m
-CRYPTO_NHPOLY1305_AVX2 all=m
-CRYPTO_ADIANTUM all=m
-CRYPTO_HCTR2 all=m
+CRYPTO_AEGIS128 all=m
+CRYPTO_AEGIS128_SIMD arm=y arm64=y
+CRYPTO_CHACHA20POLY1305 all=m
+CRYPTO_CCM all=m
+CRYPTO_GCM all=m
+CRYPTO_SEQIV all=m
+CRYPTO_ECHAINIV all=m
CRYPTO_ESSIV all=m
-#- Hash modes
-CRYPTO_CMAC all=m
-CRYPTO_HMAC all=y
-CRYPTO_XCBC all=m
-CRYPTO_VMAC all=m
-#- Digest
-CRYPTO_CRC32C all=m
-CRYPTO_CRC32C_INTEL all=m
-CRYPTO_CRC32 all=m
-CRYPTO_CRC32_PCLMUL all=m
-CRYPTO_XXHASH all=m
CRYPTO_BLAKE2B all=m
-CRYPTO_BLAKE2S_X86 x86_64=y
-CRYPTO_CRCT10DIF all=y
-CRYPTO_CRCT10DIF_PCLMUL all=m
-CRYPTO_CRC64_ROCKSOFT all=m
+CRYPTO_CMAC all=m
CRYPTO_GHASH all=m
-CRYPTO_POLYVAL_CLMUL_NI all=m
-CRYPTO_POLY1305 all=m
-CRYPTO_POLY1305_X86_64 all=m
+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_SHA1_SSSE3 all=m
-CRYPTO_SHA256_SSSE3 all=m
-CRYPTO_SHA512_SSSE3 all=m
CRYPTO_SHA256 all=y
CRYPTO_SHA512 all=y
CRYPTO_SHA3 all=m
CRYPTO_SM3 all=m
CRYPTO_SM3_GENERIC all=m
-CRYPTO_SM3_AVX_X86_64 all=m
CRYPTO_STREEBOG all=m
+CRYPTO_VMAC all=m
CRYPTO_WP512 all=m
-CRYPTO_GHASH_CLMUL_NI_INTEL all=m
-#- Ciphers
-CRYPTO_AES all=y
-CRYPTO_AES_TI all=m
-CRYPTO_AES_NI_INTEL all=m
-CRYPTO_ANUBIS all=m
-CRYPTO_ARC4 all=m
-CRYPTO_BLOWFISH all=m
-CRYPTO_BLOWFISH_X86_64 all=m
-CRYPTO_CAMELLIA all=m
-CRYPTO_CAMELLIA_X86_64 all=m
-CRYPTO_CAMELLIA_AESNI_AVX_X86_64 all=m
-CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 all=m
-CRYPTO_CAST5 all=m
-CRYPTO_CAST5_AVX_X86_64 all=m
-CRYPTO_CAST6 all=m
-CRYPTO_CAST6_AVX_X86_64 all=m
-CRYPTO_DES all=m
-CRYPTO_DES3_EDE_X86_64 all=m
-CRYPTO_FCRYPT all=m
-CRYPTO_KHAZAD all=m
-CRYPTO_CHACHA20 all=m
-CRYPTO_CHACHA20_X86_64 all=m
-CRYPTO_SEED all=m
-CRYPTO_ARIA all=m
-CRYPTO_SERPENT all=m
-CRYPTO_SERPENT_SSE2_X86_64 all=m
-CRYPTO_SERPENT_SSE2_586 all=m
-CRYPTO_SERPENT_AVX_X86_64 all=m
-CRYPTO_SERPENT_AVX2_X86_64 all=m
-CRYPTO_SM4 all=m
-CRYPTO_SM4_GENERIC all=m
-CRYPTO_SM4_AESNI_AVX_X86_64 all=m
-CRYPTO_SM4_AESNI_AVX2_X86_64 all=m
-CRYPTO_TEA all=m
-CRYPTO_TWOFISH all=m
-CRYPTO_TWOFISH_COMMON all=m
-CRYPTO_TWOFISH_586 i386=m
-CRYPTO_TWOFISH_X86_64 x86_64=m
-CRYPTO_TWOFISH_X86_64_3WAY all=m
-CRYPTO_TWOFISH_AVX_X86_64 all=m
-#- Compression
+CRYPTO_XCBC all=m
+CRYPTO_XXHASH all=m
+CRYPTO_CRC32C all=m
+CRYPTO_CRC32 all=m
+CRYPTO_CRCT10DIF all=y
+CRYPTO_CRC64_ROCKSOFT all=m
CRYPTO_DEFLATE all=m
CRYPTO_LZO all=y
CRYPTO_842 all=y
CRYPTO_LZ4 all=y
CRYPTO_LZ4HC all=m
CRYPTO_ZSTD all=y
-#- Random Number Generation
CRYPTO_ANSI_CPRNG all=m
CRYPTO_DRBG_MENU all=y
CRYPTO_DRBG_HMAC all=y
@@ -287,6 +280,13 @@ CRYPTO_USER_API_RNG_CAVP all=n
CRYPTO_USER_API_AEAD all=m
CRYPTO_USER_API_ENABLE_OBSOLETE all=y
CRYPTO_STATS all=y
+#- file arch/arm/crypto/Kconfig goes here
+#- file arch/arm64/crypto/Kconfig goes here
+#- file arch/mips/crypto/Kconfig goes here
+#- file arch/powerpc/crypto/Kconfig goes here
+#- file arch/s390/crypto/Kconfig goes here
+#- file arch/sparc/crypto/Kconfig goes here
+#- file arch/x86/crypto/Kconfig goes here
#- file drivers/crypto/Kconfig goes here
#- file crypto/asymmetric_keys/Kconfig goes here
#- file certs/Kconfig goes here
@@ -431,6 +431,7 @@ SATA_PMP all=y sparc=n
SATA_AHCI all=m sparc=n
SATA_MOBILE_LPM_POLICY all=0
SATA_AHCI_PLATFORM all=m
+AHCI_DWC all=m
AHCI_IMX all=m
AHCI_CEVA arm=m arm64=m
AHCI_MVEBU arm=m
@@ -1041,6 +1042,7 @@ CLK_VEXPRESS_OSC arm=m arm64=y
#- *** FILE: drivers/clk/xilinx/Kconfig ***
#-
XILINX_VCU all=m
+COMMON_CLK_XLNX_CLKWZRD arm=m arm64=m
#-
#- *** FILE: drivers/clocksource/Kconfig ***
@@ -1231,7 +1233,8 @@ CPU_FREQ_GOV_SCHEDUTIL all=y
#- *** FILE: drivers/cpufreq/Kconfig.x86 ***
#-
X86_INTEL_PSTATE all=y
-X86_AMD_PSTATE all=m
+X86_AMD_PSTATE all=y
+X86_AMD_PSTATE_UT all=m
X86_AMD_FREQ_SENSITIVITY all=m
#- shared options
@@ -1284,6 +1287,7 @@ CRYPTO_DEV_CCREE arm=m arm64=m
#- file drivers/crypto/hisilicon/Kconfig goes here
#- file drivers/crypto/amlogic/Kconfig goes here
#- file drivers/crypto/keembay/Kconfig goes here
+#- file drivers/crypto/aspeed/Kconfig goes here
#-
#- *** FILE: drivers/crypto/amlogic/Kconfig ***
@@ -1756,7 +1760,6 @@ GPIO_SCH311X all=m
GPIO_TS5500 all=m
GPIO_WINBOND all=m
GPIO_WS16C48 all=m
-GPIO_ADP5588 all=m
GPIO_ADNP arm=m arm64=m
GPIO_GW_PLD arm=m arm64=m
GPIO_MAX7300 all=m
@@ -1819,7 +1822,6 @@ GPIO_SIM all=m
#- *** FILE: drivers/gpu/drm/Kconfig ***
#-
DRM all=m
-DRM_DEBUG_SELFTEST all=n
DRM_FBDEV_EMULATION all=y
DRM_FBDEV_OVERALLOC all=100
DRM_LOAD_EDID_FIRMWARE all=y
@@ -2445,6 +2447,7 @@ HID_KYE all=m
HID_UCLOGIC all=m
HID_WALTOP all=m
HID_VIEWSONIC all=m
+HID_VRC2 all=m
HID_XIAOMI all=m
HID_GYRATION all=m
HID_ICADE all=m
@@ -2488,6 +2491,7 @@ HID_PICOLCD_LEDS all=y
HID_PLANTRONICS all=m
HID_PLAYSTATION all=m
PLAYSTATION_FF all=y
+HID_PXRC all=m
HID_RAZER all=m
HID_PRIMAX all=m
HID_RETRODE all=m
@@ -2680,6 +2684,7 @@ SENSORS_MAX1668 all=m
SENSORS_MAX197 all=m
SENSORS_MAX31722 all=m
SENSORS_MAX31730 all=m
+SENSORS_MAX31760 all=m
SENSORS_MAX6620 all=m
SENSORS_MAX6621 all=m
SENSORS_MAX6639 all=m
@@ -2740,6 +2745,7 @@ SENSORS_SY7636A all=m
SENSORS_DME1737 all=m
SENSORS_EMC1403 all=m
SENSORS_EMC2103 all=m
+SENSORS_EMC2305 all=m
SENSORS_EMC6W201 all=m
SENSORS_SMSC47M1 all=m
SENSORS_SMSC47M192 all=m
@@ -2790,7 +2796,6 @@ SENSORS_INTEL_M10_BMC_HWMON all=m
SENSORS_ACPI_POWER all=m
SENSORS_ATK0110 all=m
SENSORS_ASUS_WMI all=m
-SENSORS_ASUS_WMI_EC all=m
SENSORS_ASUS_EC all=m
#-
@@ -2851,6 +2856,7 @@ SENSORS_Q54SJ108A2 all=m
SENSORS_STPDDC60 all=m
SENSORS_TPS40422 all=m
SENSORS_TPS53679 all=m
+SENSORS_TPS546D24 all=m
SENSORS_UCD9000 all=m
SENSORS_UCD9200 all=m
SENSORS_XDPE152 all=m
@@ -2983,6 +2989,7 @@ I2C_DIOLAN_U2C all=m
I2C_DLN2 all=m
I2C_CP2615 all=m
I2C_PARPORT all=m
+I2C_PCI1XXXX all=m
I2C_ROBOTFUZZ_OSIF all=m
I2C_TAOS_EVM all=m
I2C_TINY_USB all=m
@@ -3108,6 +3115,7 @@ MMA7660 all=m
MMA8452 all=m
MMA9551 all=m
MMA9553 all=m
+MSA311 all=m
MXC4005 all=m
MXC6255 all=m
SCA3000 all=m
@@ -3160,6 +3168,7 @@ LTC2497 all=m
MAX1027 all=m
MAX11100 all=m
MAX1118 all=m
+MAX11205 all=m
MAX1241 all=m
MAX1363 all=m
MAX9611 all=m
@@ -3177,9 +3186,9 @@ QCOM_SPMI_VADC all=m
QCOM_SPMI_ADC5 all=m
RN5T618_ADC arm=m arm64=m
ROCKCHIP_SARADC arm64=m
+RICHTEK_RTQ6056 all=m
SD_ADC_MODULATOR all=m
STMPE_ADC arm=m arm64=m
-STX104 all=m
TI_ADC081C all=m
TI_ADC0832 all=m
TI_ADC084S021 all=m
@@ -3204,6 +3213,7 @@ XILINX_XADC all=m
#- *** FILE: drivers/iio/addac/Kconfig ***
#-
AD74413R all=m
+STX104 all=m
#-
#- *** FILE: drivers/iio/afe/Kconfig ***
@@ -3230,6 +3240,7 @@ IIO_KFIFO_BUF all=m
#- *** FILE: drivers/iio/cdc/Kconfig ***
#-
AD7150 all=m
+AD7746 all=m
#-
#- *** FILE: drivers/iio/chemical/Kconfig ***
@@ -3379,6 +3390,7 @@ ADIS16460 all=m
ADIS16475 all=m
ADIS16480 all=m
#- file drivers/iio/imu/bmi160/Kconfig goes here
+#- file drivers/iio/imu/bno055/Kconfig goes here
FXOS8700_I2C all=m
FXOS8700_SPI all=m
KMX61 all=m
@@ -3393,6 +3405,12 @@ KMX61 all=m
BMI160_I2C all=m
BMI160_SPI all=m
+#-
+#- *** FILE: drivers/iio/imu/bno055/Kconfig ***
+#-
+BOSCH_BNO055_SERIAL all=m
+BOSCH_BNO055_I2C all=m
+
#-
#- *** FILE: drivers/iio/imu/inv_icm42600/Kconfig ***
#-
@@ -3451,6 +3469,7 @@ JSA1212 all=m
RPR0521 all=m
SENSORS_LM3533 all=m
LTR501 all=m
+LTRF216A all=m
LV0104CS all=m
MAX44000 all=m
MAX44009 all=m
@@ -3886,6 +3905,7 @@ KEYBOARD_MCS all=m
KEYBOARD_MPR121 all=m
KEYBOARD_NEWTON all=m
KEYBOARD_OPENCORES all=m
+KEYBOARD_PINEPHONE all=m
KEYBOARD_PMIC8XXX arm=m
KEYBOARD_SAMSUNG all=m
KEYBOARD_GOLDFISH_EVENTS all=m
@@ -3958,6 +3978,7 @@ INPUT_PCAP all=m
INPUT_ADXL34X all=m
INPUT_ADXL34X_I2C all=m
INPUT_ADXL34X_SPI all=m
+INPUT_IBM_PANEL all=m
INPUT_IMS_PCU all=m
INPUT_IQS269A all=m
INPUT_IQS626A all=m
@@ -3971,6 +3992,7 @@ INPUT_DRV260X_HAPTICS all=m
INPUT_DRV2665_HAPTICS all=m
INPUT_DRV2667_HAPTICS all=m
INPUT_RAVE_SP_PWRBUTTON all=m
+INPUT_RT5120_PWRKEY all=m
#-
#- *** FILE: drivers/input/mouse/Kconfig ***
@@ -4589,7 +4611,6 @@ USB_RAINSHADOW_CEC all=m
VIDEO_CX2341X all=m
VIDEO_TVEEPROM all=m
#- file drivers/media/common/b2c2/Kconfig goes here
-#- file drivers/media/common/saa7146/Kconfig goes here
#- file drivers/media/common/siano/Kconfig goes here
#- file drivers/media/common/v4l2-tpg/Kconfig goes here
#- file drivers/media/common/videobuf2/Kconfig goes here
@@ -4600,12 +4621,6 @@ VIDEO_TVEEPROM all=m
DVB_B2C2_FLEXCOP all=m
DVB_B2C2_FLEXCOP_DEBUG all=n
-#-
-#- *** FILE: drivers/media/common/saa7146/Kconfig ***
-#-
-VIDEO_SAA7146 all=m
-VIDEO_SAA7146_VV all=m
-
#-
#- *** FILE: drivers/media/common/siano/Kconfig ***
#-
@@ -4850,16 +4865,15 @@ SMS_SDIO_DRV all=m
#-
MEDIA_PCI_SUPPORT all=y
#- Media capture support
-#- file drivers/media/pci/meye/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
+#- file drivers/media/pci/zoran/Kconfig goes here
#- Media capture/analog TV support
#- file drivers/media/pci/dt3155/Kconfig goes here
#- file drivers/media/pci/ivtv/Kconfig goes here
-#- file drivers/media/pci/saa7146/Kconfig goes here
#- Media capture/analog/hybrid TV support
#- file drivers/media/pci/bt8xx/Kconfig goes here
#- file drivers/media/pci/cobalt/Kconfig goes here
@@ -4880,7 +4894,6 @@ MEDIA_PCI_SUPPORT all=y
#- file drivers/media/pci/pt1/Kconfig goes here
#- file drivers/media/pci/pt3/Kconfig goes here
#- file drivers/media/pci/smipcie/Kconfig goes here
-#- file drivers/media/pci/ttpci/Kconfig goes here
VIDEO_PCI_SKELETON all=m
#- file drivers/media/pci/intel/ipu3/Kconfig goes here
@@ -4966,11 +4979,6 @@ MANTIS_CORE all=m
DVB_MANTIS all=m
DVB_HOPPER all=m
-#-
-#- *** FILE: drivers/media/pci/meye/Kconfig ***
-#-
-VIDEO_MEYE i386=m x86_64=m
-
#-
#- *** FILE: drivers/media/pci/netup_unidvb/Kconfig ***
#-
@@ -5005,13 +5013,6 @@ VIDEO_SAA7134_RC all=y
VIDEO_SAA7134_DVB all=m sparc64=n
VIDEO_SAA7134_GO7007 all=m
-#-
-#- *** FILE: drivers/media/pci/saa7146/Kconfig ***
-#-
-VIDEO_HEXIUM_GEMINI all=m
-VIDEO_HEXIUM_ORION all=m
-VIDEO_MXB all=m sparc=n
-
#-
#- *** FILE: drivers/media/pci/saa7164/Kconfig ***
#-
@@ -5032,14 +5033,6 @@ VIDEO_SOLO6X10 all=m
#-
STA2X11_VIP all=m
-#-
-#- *** FILE: drivers/media/pci/ttpci/Kconfig ***
-#-
-DVB_BUDGET_CORE all=m
-DVB_BUDGET all=m sparc=n
-DVB_BUDGET_CI all=m sparc=n
-DVB_BUDGET_AV all=m sparc=n
-
#-
#- *** FILE: drivers/media/pci/tw5864/Kconfig ***
#-
@@ -5055,6 +5048,18 @@ VIDEO_TW68 all=m
#-
VIDEO_TW686X all=m
+#-
+#- *** FILE: drivers/media/pci/zoran/Kconfig ***
+#-
+VIDEO_ZORAN all=m ppc=n sparc=n
+VIDEO_ZORAN_DC30 all=y
+VIDEO_ZORAN_ZR36060 all=y
+VIDEO_ZORAN_BUZ all=y
+VIDEO_ZORAN_DC10 all=y
+VIDEO_ZORAN_LML33 all=y
+VIDEO_ZORAN_LML33R10 all=y
+VIDEO_ZORAN_AVS6EYES all=y
+
#-
#- *** FILE: drivers/media/platform/Kconfig ***
#-
@@ -5084,6 +5089,7 @@ VIDEO_MUX arm=m arm64=m
#- file drivers/media/platform/st/Kconfig goes here
#- file drivers/media/platform/sunxi/Kconfig goes here
#- file drivers/media/platform/ti/Kconfig goes here
+#- file drivers/media/platform/verisilicon/Kconfig goes here
#- file drivers/media/platform/via/Kconfig goes here
#- file drivers/media/platform/xilinx/Kconfig goes here
@@ -5138,6 +5144,13 @@ VIDEO_ROCKCHIP_ISP1 arm64=m
#-
DVB_C8SECTPFE arm=m
+#-
+#- *** FILE: drivers/media/platform/verisilicon/Kconfig ***
+#-
+#- Verisilicon media platform drivers
+VIDEO_HANTRO arm64=m
+VIDEO_HANTRO_ROCKCHIP arm64=y
+
#-
#- *** FILE: drivers/media/platform/via/Kconfig ***
#-
@@ -5300,13 +5313,11 @@ MEDIA_TUNER_TDA18212 all=m
#-
MEDIA_USB_SUPPORT all=y
#- Webcam devices
-#- file drivers/media/usb/cpia2/Kconfig goes here
#- file drivers/media/usb/gspca/Kconfig goes here
#- file drivers/media/usb/pwc/Kconfig goes here
#- file drivers/media/usb/s2255/Kconfig goes here
#- file drivers/media/usb/usbtv/Kconfig goes here
#- file drivers/media/usb/uvc/Kconfig goes here
-#- file drivers/media/usb/zr364xx/Kconfig goes here
#- Analog TV USB devices
#- file drivers/media/usb/go7007/Kconfig goes here
#- file drivers/media/usb/hdpvr/Kconfig goes here
@@ -5315,7 +5326,6 @@ MEDIA_USB_SUPPORT all=y
#- Analog/digital TV USB devices
#- file drivers/media/usb/au0828/Kconfig goes here
#- file drivers/media/usb/cx231xx/Kconfig goes here
-#- file drivers/media/usb/tm6000/Kconfig goes here
#- Digital TV USB devices
#- file drivers/media/usb/as102/Kconfig goes here
#- file drivers/media/usb/b2c2/Kconfig goes here
@@ -5354,11 +5364,6 @@ VIDEO_AU0828_RC all=y
DVB_B2C2_FLEXCOP_USB alpha=m arm=m arm64=m ia64=m i386=m ppc=m ppc64=m sparc64=m x86_64=m
DVB_B2C2_FLEXCOP_USB_DEBUG all=n
-#-
-#- *** FILE: drivers/media/usb/cpia2/Kconfig ***
-#-
-VIDEO_CPIA2 all=m
-
#-
#- *** FILE: drivers/media/usb/cx231xx/Kconfig ***
#-
@@ -5548,13 +5553,6 @@ SMS_USB_DRV all=m
VIDEO_STK1160_COMMON all=m
VIDEO_STK1160 all=m
-#-
-#- *** FILE: drivers/media/usb/tm6000/Kconfig ***
-#-
-VIDEO_TM6000 all=m
-VIDEO_TM6000_ALSA all=m
-VIDEO_TM6000_DVB all=m
-
#-
#- *** FILE: drivers/media/usb/ttusb-budget/Kconfig ***
#-
@@ -5576,11 +5574,6 @@ VIDEO_USBTV all=m
USB_VIDEO_CLASS all=m sparc=n
USB_VIDEO_CLASS_INPUT_EVDEV all=y sparc=n
-#-
-#- *** FILE: drivers/media/usb/zr364xx/Kconfig ***
-#-
-USB_ZR364XX all=m
-
#-
#- *** FILE: drivers/media/v4l2-core/Kconfig ***
#-
@@ -5698,8 +5691,10 @@ MFD_MAX77693 all=m
MFD_MAX77714 arm=m arm64=m
MFD_MAX8907 all=m
MFD_MT6360 all=m
+MFD_MT6370 all=m
MFD_MT6397 all=m
MFD_MENF21BMC all=m
+MFD_OCELOT all=m
EZX_PCAP all=y
MFD_CPCAP arm=m arm64=m
MFD_VIPERBOARD all=m
@@ -5710,9 +5705,11 @@ PCF50633_ADC all=m
PCF50633_GPIO all=m
UCB1400_CORE all=m
MFD_PM8XXX arm=m
+MFD_SY7636A all=m
MFD_RDC321X all=m
MFD_RT4831=m
MFD_RT5033 all=m
+MFD_RT5120 all=m
MFD_RK808 arm=m arm64=m
MFD_RN5T618 all=m
MFD_SI476X_CORE all=m
@@ -5827,6 +5824,7 @@ VCPU_STALL_DETECTOR arm=m arm64=m
#- file drivers/misc/habanalabs/Kconfig goes here
#- file drivers/misc/uacce/Kconfig goes here
#- file drivers/misc/pvpanic/Kconfig goes here
+#- file drivers/misc/mchp_pci1xxxx/Kconfig goes here
#-
#- *** FILE: drivers/misc/altera-stapl/Kconfig ***
@@ -5893,6 +5891,11 @@ HABANA_AI all=m
SENSORS_LIS3_SPI all=m
SENSORS_LIS3_I2C all=m
+#-
+#- *** FILE: drivers/misc/mchp_pci1xxxx/Kconfig ***
+#-
+GP_PCI1XXXX all=m
+
#-
#- *** FILE: drivers/misc/mei/Kconfig ***
#-
@@ -6179,7 +6182,7 @@ MTD_NAND_CS553X i386=m
MTD_NAND_ORION arm=m
MTD_NAND_MARVELL arm=m
MTD_NAND_PASEMI ppc64=m
-MTD_NAND_BRCMNAND arm=m arm64=m
+#- file drivers/mtd/nand/raw/brcmnand/Kconfig goes here
MTD_NAND_OXNAS all=m
MTD_NAND_FSL_ELBC ppc=m ppc64=m
#- file drivers/mtd/nand/raw/ingenic/Kconfig goes here
@@ -6202,6 +6205,11 @@ MTD_NAND_DISKONCHIP_PROBE_ADVANCED all=n
MTD_NAND_DISKONCHIP_PROBE_ADDRESS all=0
MTD_NAND_DISKONCHIP_BBTWRITE all=y
+#-
+#- *** FILE: drivers/mtd/nand/raw/brcmnand/Kconfig ***
+#-
+MTD_NAND_BRCMNAND arm=m arm64=m
+
#-
#- *** FILE: drivers/mtd/nand/spi/Kconfig ***
#-
@@ -6295,6 +6303,7 @@ MHI_NET all=m
#- file drivers/net/ipa/Kconfig goes here
NET_SB1000 all=m
#- file drivers/net/phy/Kconfig goes here
+#- file drivers/net/pse-pd/Kconfig goes here
#- file drivers/net/can/Kconfig goes here
#- file drivers/net/mctp/Kconfig goes here
#- file drivers/net/mdio/Kconfig goes here
@@ -6634,6 +6643,7 @@ DNET all=m
#- file drivers/net/ethernet/wangxun/Kconfig goes here
#- file drivers/net/ethernet/xscale/Kconfig goes here
JME all=m
+#- file drivers/net/ethernet/adi/Kconfig goes here
#- file drivers/net/ethernet/litex/Kconfig goes here
#- file drivers/net/ethernet/marvell/Kconfig goes here
#- file drivers/net/ethernet/mediatek/Kconfig goes here
@@ -6692,6 +6702,12 @@ ETHOC all=m
NET_VENDOR_ADAPTEC all=y
ADAPTEC_STARFIRE all=m
+#-
+#- *** FILE: drivers/net/ethernet/adi/Kconfig ***
+#-
+NET_VENDOR_ADI all=y
+ADIN1110 all=m
+
#-
#- *** FILE: drivers/net/ethernet/agere/Kconfig ***
#-
@@ -7131,6 +7147,7 @@ MLX5_TC_CT all=y
MLX5_TC_SAMPLE all=y
MLX5_CORE_EN_DCB all=y
MLX5_CORE_IPOIB all=y
+MLX5_EN_MACSEC all=y
MLX5_EN_IPSEC all=y
MLX5_EN_TLS all=y
MLX5_SW_STEERING all=y
@@ -7470,6 +7487,7 @@ VIA_VELOCITY all=m
#- *** FILE: drivers/net/ethernet/wangxun/Kconfig ***
#-
NET_VENDOR_WANGXUN all=y
+NGBE all=m
TXGBE all=m
#-
@@ -7657,6 +7675,12 @@ PPPOL2TP all=m
PPP_ASYNC all=m
PPP_SYNC_TTY all=m
+#-
+#- *** FILE: drivers/net/pse-pd/Kconfig ***
+#-
+PSE_CONTROLLER all=y
+PSE_REGULATOR all=m
+
#-
#- *** FILE: drivers/net/slip/Kconfig ***
#-
@@ -8491,13 +8515,9 @@ NVME_TARGET_AUTH all=y
#-
NVMEM all=y
NVMEM_SYSFS all=y
-NVMEM_SPMI_SDAM all=m
-ROCKCHIP_EFUSE arm64=m
-ROCKCHIP_OTP arm64=m
-MESON_EFUSE arm64=m
-MESON_MX_EFUSE arm64=m
-RAVE_SP_EEPROM all=m
+NVMEM_RAVE_SP_EEPROM all=m
NVMEM_RMEM all=m
+NVMEM_SPMI_SDAM all=m
#-
#- *** FILE: drivers/of/Kconfig ***
@@ -8731,6 +8751,7 @@ PHY_CAN_TRANSCEIVER=m
#- file drivers/phy/samsung/Kconfig goes here
#- file drivers/phy/socionext/Kconfig goes here
#- file drivers/phy/st/Kconfig goes here
+#- file drivers/phy/sunplus/Kconfig goes here
#- file drivers/phy/tegra/Kconfig goes here
#- file drivers/phy/ti/Kconfig goes here
#- file drivers/phy/intel/Kconfig goes here
@@ -8845,6 +8866,7 @@ GENERIC_PINCONF all=y
DEBUG_PINCTRL all=n
PINCTRL_AMD all=y
PINCTRL_AXP209 arm=m arm64=m
+PINCTRL_CY8C95X0 all=m
PINCTRL_DA9062 all=m
PINCTRL_EQUILIBRIUM arm64=m
PINCTRL_MCP23S08 all=m
@@ -8873,6 +8895,7 @@ PINCTRL_STMFX arm=m arm64=m
#- file drivers/pinctrl/samsung/Kconfig goes here
#- file drivers/pinctrl/spear/Kconfig goes here
#- file drivers/pinctrl/sprd/Kconfig goes here
+#- file drivers/pinctrl/starfive/Kconfig goes here
#- file drivers/pinctrl/stm32/Kconfig goes here
#- file drivers/pinctrl/sunplus/Kconfig goes here
#- file drivers/pinctrl/sunxi/Kconfig goes here
@@ -8945,6 +8968,7 @@ CROS_EC_TYPEC all=m
CROS_USBPD_LOGGER all=m
CROS_USBPD_NOTIFY all=m
CHROMEOS_PRIVACY_SCREEN all=m
+CROS_TYPEC_SWITCH all=m
#- file drivers/platform/chrome/wilco_ec/Kconfig goes here
#-
@@ -9079,9 +9103,15 @@ WINMATE_FM07_KEYS all=m
#-
#- *** FILE: drivers/platform/x86/amd/Kconfig ***
#-
+#- file drivers/platform/x86/amd/pmf/Kconfig goes here
AMD_PMC all=m
AMD_HSMP all=m
+#-
+#- *** FILE: drivers/platform/x86/amd/pmf/Kconfig ***
+#-
+AMD_PMF all=m
+
#-
#- *** FILE: drivers/platform/x86/dell/Kconfig ***
#-
@@ -9289,6 +9319,7 @@ CHARGER_MAX77693 all=m
CHARGER_MAX77976 all=m
CHARGER_MP2629 all=m
CHARGER_MT6360 all=m
+CHARGER_MT6370 all=m
CHARGER_BQ2415X all=m
CHARGER_BQ24190 all=m
CHARGER_BQ24257 all=m
@@ -9476,9 +9507,12 @@ REGULATOR_MPQ7920 arm=m arm64=m
REGULATOR_MT6311 all=m
REGULATOR_MT6315 all=m
REGULATOR_MT6323 all=m
+REGULATOR_MT6331 all=m
+REGULATOR_MT6332 all=m
REGULATOR_MT6358 all=m
REGULATOR_MT6359=m
REGULATOR_MT6360 all=m
+REGULATOR_MT6370 all=m
REGULATOR_MT6397 all=m
REGULATOR_PCA9450 all=m
REGULATOR_PCAP all=m
@@ -9497,6 +9531,7 @@ REGULATOR_RN5T618 all=m
REGULATOR_RT4801 all=m
REGULATOR_RT4831=m
REGULATOR_RT5033 all=m
+REGULATOR_RT5120 all=m
REGULATOR_RT5190A all=m
REGULATOR_RT5759 all=m
REGULATOR_RT6160=m
@@ -10114,6 +10149,7 @@ SPI_FSL_DSPI all=m
SPI_MESON_SPICC arm64=m
SPI_MESON_SPIFC arm64=m
SPI_MICROCHIP_CORE all=m
+SPI_MICROCHIP_CORE_QSPI all=m
SPI_LANTIQ_SSC all=m
SPI_OC_TINY all=m
SPI_ORION arm=m
@@ -10177,8 +10213,6 @@ STAGING all=y
#- file drivers/staging/media/Kconfig goes here
#- file drivers/staging/board/Kconfig goes here
#- file drivers/staging/gdm724x/Kconfig goes here
-#- file drivers/staging/fwserial/Kconfig goes here
-#- file drivers/staging/clocking-wizard/Kconfig goes here
#- file drivers/staging/fbtft/Kconfig goes here
#- file drivers/staging/most/Kconfig goes here
#- file drivers/staging/ks7010/Kconfig goes here
@@ -10200,11 +10234,6 @@ XIL_AXIS_FIFO all=m
#-
STAGING_BOARD arm=n arm64=n
-#-
-#- *** FILE: drivers/staging/clocking-wizard/Kconfig ***
-#-
-COMMON_CLK_XLNX_CLKWZRD arm=m arm64=m
-
#-
#- *** FILE: drivers/staging/fbtft/Kconfig ***
#-
@@ -10254,13 +10283,6 @@ HMS_ANYBUSS_BUS arm=m arm64=m
ARCX_ANYBUS_CONTROLLER arm=m arm64=m
HMS_PROFINET arm=m arm64=m
-#-
-#- *** FILE: drivers/staging/fwserial/Kconfig ***
-#-
-FIREWIRE_SERIAL all=m
-FWTTY_MAX_TOTAL_PORTS all=64
-FWTTY_MAX_CARD_PORTS all=32
-
#-
#- *** FILE: drivers/staging/gdm724x/Kconfig ***
#-
@@ -10307,11 +10329,6 @@ ADT7316 all=m
ADT7316_SPI all=m
ADT7316_I2C all=m
-#-
-#- *** FILE: drivers/staging/iio/cdc/Kconfig ***
-#-
-AD7746 all=m
-
#-
#- *** FILE: drivers/staging/iio/frequency/Kconfig ***
#-
@@ -10345,18 +10362,23 @@ KS7010 all=m
#-
STAGING_MEDIA all=y
#- file drivers/staging/media/atomisp/Kconfig goes here
-#- file drivers/staging/media/av7110/Kconfig goes here
-#- file drivers/staging/media/hantro/Kconfig goes here
#- file drivers/staging/media/imx/Kconfig goes here
#- file drivers/staging/media/ipu3/Kconfig goes here
#- file drivers/staging/media/max96712/Kconfig goes here
#- file drivers/staging/media/meson/vdec/Kconfig goes here
#- file drivers/staging/media/omap4iss/Kconfig goes here
#- file drivers/staging/media/rkvdec/Kconfig goes here
-#- file drivers/staging/media/stkwebcam/Kconfig goes here
#- file drivers/staging/media/sunxi/Kconfig goes here
#- file drivers/staging/media/tegra-video/Kconfig goes here
-#- file drivers/staging/media/zoran/Kconfig goes here
+STAGING_MEDIA_DEPRECATED all=n
+#- file drivers/staging/media/deprecated/cpia2/Kconfig goes here
+#- file drivers/staging/media/deprecated/fsl-viu/Kconfig goes here
+#- file drivers/staging/media/deprecated/meye/Kconfig goes here
+#- file drivers/staging/media/deprecated/saa7146/Kconfig goes here
+#- file drivers/staging/media/deprecated/stkwebcam/Kconfig goes here
+#- file drivers/staging/media/deprecated/tm6000/Kconfig goes here
+#- file drivers/staging/media/deprecated/vpfe_capture/Kconfig goes here
+#- file drivers/staging/media/deprecated/zr364xx/Kconfig goes here
#-
#- *** FILE: drivers/staging/media/atomisp/Kconfig ***
@@ -10379,7 +10401,17 @@ VIDEO_ATOMISP_OV5693 all=m
VIDEO_ATOMISP_LM3554 all=m
#-
-#- *** FILE: drivers/staging/media/av7110/Kconfig ***
+#- *** FILE: drivers/staging/media/deprecated/cpia2/Kconfig ***
+#-
+VIDEO_CPIA2 all=m
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/meye/Kconfig ***
+#-
+VIDEO_MEYE i386=m x86_64=m
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/saa7146/av7110/Kconfig ***
#-
DVB_AV7110 all=m sparc=n
DVB_AV7110_OSD all=y
@@ -10387,10 +10419,42 @@ DVB_BUDGET_PATCH all=m
DVB_SP8870 all=m
#-
-#- *** FILE: drivers/staging/media/hantro/Kconfig ***
+#- *** FILE: drivers/staging/media/deprecated/saa7146/common/Kconfig ***
#-
-VIDEO_HANTRO arm64=m
-VIDEO_HANTRO_ROCKCHIP arm64=y
+VIDEO_SAA7146 all=m
+VIDEO_SAA7146_VV all=m
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/saa7146/saa7146/Kconfig ***
+#-
+VIDEO_HEXIUM_GEMINI all=m
+VIDEO_HEXIUM_ORION all=m
+VIDEO_MXB all=m sparc=n
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/saa7146/ttpci/Kconfig ***
+#-
+DVB_BUDGET_CORE all=m
+DVB_BUDGET all=m sparc=n
+DVB_BUDGET_CI all=m sparc=n
+DVB_BUDGET_AV all=m sparc=n
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/stkwebcam/Kconfig ***
+#-
+VIDEO_STKWEBCAM all=m
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/tm6000/Kconfig ***
+#-
+VIDEO_TM6000 all=m
+VIDEO_TM6000_ALSA all=m
+VIDEO_TM6000_DVB all=m
+
+#-
+#- *** FILE: drivers/staging/media/deprecated/zr364xx/Kconfig ***
+#-
+USB_ZR364XX all=m
#-
#- *** FILE: drivers/staging/media/ipu3/Kconfig ***
@@ -10412,23 +10476,6 @@ VIDEO_MESON_VDEC arm64=m
#-
VIDEO_ROCKCHIP_VDEC arm64=m
-#-
-#- *** FILE: drivers/staging/media/stkwebcam/Kconfig ***
-#-
-VIDEO_STKWEBCAM all=m
-
-#-
-#- *** FILE: drivers/staging/media/zoran/Kconfig ***
-#-
-VIDEO_ZORAN all=m ppc=n sparc=n
-VIDEO_ZORAN_DC30 all=y
-VIDEO_ZORAN_ZR36060 all=y
-VIDEO_ZORAN_BUZ all=y
-VIDEO_ZORAN_DC10 all=y
-VIDEO_ZORAN_LML33 all=y
-VIDEO_ZORAN_LML33R10 all=y
-VIDEO_ZORAN_AVS6EYES all=y
-
#-
#- *** FILE: drivers/staging/most/Kconfig ***
#-
@@ -10823,6 +10870,7 @@ SERIAL_ARC_NR_PORTS all=1
SERIAL_RP2 all=m
SERIAL_RP2_NR_UARTS all=32
SERIAL_FSL_LPUART all=m
+SERIAL_FSL_LPUART_CONSOLE all=y
SERIAL_FSL_LINFLEXUART all=m
SERIAL_CONEXANT_DIGICOLOR arm=m arm64=m
SERIAL_ST_ASC all=m
@@ -11350,6 +11398,7 @@ TYPEC_TCPM all=m
TYPEC_TCPCI all=m
TYPEC_RT1711H all=m
TYPEC_MT6360 all=m
+TYPEC_TCPCI_MT6370 all=m
TYPEC_TCPCI_MAXIM all=m
TYPEC_FUSB302 all=m
TYPEC_WCOVE all=m
@@ -11488,6 +11537,7 @@ BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
BACKLIGHT_PWM all=m
BACKLIGHT_DA903X all=m
BACKLIGHT_DA9052 all=m
+BACKLIGHT_MT6370 all=m
BACKLIGHT_APPLE all=m
BACKLIGHT_QCOM_WLED all=m
BACKLIGHT_RT4831=m
@@ -11820,6 +11870,7 @@ ADVANTECH_WDT i386=m x86_64=m
ALIM1535_WDT i386=m x86_64=m
ALIM7101_WDT all=m
EBC_C384_WDT all=m
+EXAR_WDT all=m
F71808E_WDT all=m
SP5100_TCO all=m
GEODE_WDT all=m
@@ -12014,8 +12065,6 @@ BINFMT_ELF_FDPIC arm=n
CORE_DUMP_DEFAULT_ELF_HEADERS all=y
BINFMT_SCRIPT all=y
BINFMT_FLAT arm=n
-BINFMT_AOUT alpha=m i386=m sparc=y
-OSF4_COMPAT alpha=n
BINFMT_MISC all=m
#-
@@ -12692,7 +12741,6 @@ CGROUPS all=y
PAGE_COUNTER all=y
CGROUP_FAVOR_DYNMODS all=n
MEMCG all=y
-MEMCG_SWAP all=y
BLK_CGROUP all=y
CGROUP_SCHED all=y
FAIR_GROUP_SCHED all=y
@@ -13017,6 +13065,7 @@ TEXTSEARCH_FSM all=m
HAS_IOMEM all=y
#- file kernel/dma/Kconfig goes here
CHECK_SIGNATURE all=y
+FORCE_NR_CPUS all=n
CPU_RMAP all=y
GLOB_SELFTEST all=n
IRQ_POLL arm=y arm64=y
@@ -13088,6 +13137,7 @@ DEBUG_HIGHMEM arm=n i386=n sparc=n
DEBUG_STACKOVERFLOW all=n
#- file lib/Kconfig.kasan goes here
#- file lib/Kconfig.kfence goes here
+#- file lib/Kconfig.kmsan goes here
DEBUG_SHIRQ all=n
PANIC_ON_OOPS all=n
PANIC_TIMEOUT all=180
@@ -13129,6 +13179,7 @@ DEBUG_PLIST all=n
DEBUG_SG all=n
DEBUG_NOTIFIERS all=n
BUG_ON_DATA_CORRUPTION all=n
+DEBUG_MAPLE_TREE all=n
DEBUG_CREDENTIALS all=n
#- file kernel/rcu/Kconfig.debug goes here
DEBUG_WQ_FORCE_RR_CPU all=n
@@ -13145,6 +13196,7 @@ NOTIFIER_ERROR_INJECTION all=m
PM_NOTIFIER_ERROR_INJECT all=m
OF_RECONFIG_NOTIFIER_ERROR_INJECT arm=m arm64=m
NETDEV_NOTIFIER_ERROR_INJECT all=m
+FUNCTION_ERROR_INJECTION all=n
FAULT_INJECTION all=n
ARCH_HAS_KCOV all=y
KCOV all=n
@@ -13173,6 +13225,7 @@ TEST_SCANF=m
TEST_BITMAP all=m
TEST_UUID all=m
TEST_XARRAY all=m
+TEST_MAPLE_TREE all=m
TEST_RHASHTABLE all=n
TEST_SIPHASH all=m
TEST_IDA all=m
@@ -13360,6 +13413,9 @@ GUP_TEST all=n
ANON_VMA_NAME all=n
USERFAULTFD all=y
PTE_MARKER_UFFD_WP all=y
+LRU_GEN all=y
+LRU_GEN_ENABLED all=y
+LRU_GEN_STATS all=n
#- file mm/damon/Kconfig goes here
#-
@@ -13449,7 +13505,6 @@ BRIDGE_NETFILTER all=m
#- file net/netfilter/Kconfig goes here
#- file net/ipv4/netfilter/Kconfig goes here
#- file net/ipv6/netfilter/Kconfig goes here
-#- file net/decnet/netfilter/Kconfig goes here
#- file net/bridge/netfilter/Kconfig goes here
#- file net/bpfilter/Kconfig goes here
#- file net/dccp/Kconfig goes here
@@ -13462,7 +13517,6 @@ BRIDGE_NETFILTER all=m
#- file net/bridge/Kconfig goes here
#- file net/dsa/Kconfig goes here
#- file net/8021q/Kconfig goes here
-#- file net/decnet/Kconfig goes here
#- file net/llc/Kconfig goes here
#- file drivers/net/appletalk/Kconfig goes here
#- file net/x25/Kconfig goes here
@@ -13695,17 +13749,6 @@ IP_DCCP_CCID3 all=y
IP_DCCP_CCID3_DEBUG all=n
IP_DCCP_TFRC_LIB all=y
-#-
-#- *** FILE: net/decnet/Kconfig ***
-#-
-DECNET all=m
-DECNET_ROUTER all=y
-
-#-
-#- *** FILE: net/decnet/netfilter/Kconfig ***
-#-
-DECNET_NF_GRABULATOR all=m
-
#-
#- *** FILE: net/dns_resolver/Kconfig ***
#-
@@ -14500,6 +14543,7 @@ NET_KEY_MIGRATE all=y
#- *** FILE: samples/Kconfig ***
#-
SAMPLES all=n
+#- file samples/rust/Kconfig goes here
#-
#- *** FILE: scripts/gcc-plugins/Kconfig ***
@@ -15007,6 +15051,7 @@ SND_PS3_DEFAULT_START_DELAY ppc64=2000
SND_SOC all=m
#- file sound/soc/adi/Kconfig goes here
#- file sound/soc/amd/Kconfig goes here
+#- file sound/soc/apple/Kconfig goes here
#- file sound/soc/atmel/Kconfig goes here
#- file sound/soc/au1x/Kconfig goes here
#- file sound/soc/bcm/Kconfig goes here
@@ -15066,6 +15111,8 @@ SND_SOC_AMD_YC_MACH all=m
SND_AMD_ACP_CONFIG arm=m arm64=m
#- file sound/soc/amd/acp/Kconfig goes here
SND_SOC_AMD_RPL_ACP6x all=m
+SND_SOC_AMD_PS all=m
+SND_SOC_AMD_PS_MACH all=m
#-
#- *** FILE: sound/soc/amd/acp/Kconfig ***
@@ -15088,9 +15135,6 @@ SND_SOC_MIKROE_PROTO arm=m arm64=m
#-
SND_BCM2835_SOC_I2S arm=m
SND_BCM63XX_I2S_WHISTLER all=m
-SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
-SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
-SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
#-
#- *** FILE: sound/soc/codecs/Kconfig ***
@@ -15136,6 +15180,7 @@ SND_SOC_CS42L51_I2C all=m
SND_SOC_CS42L52 all=m
SND_SOC_CS42L56 all=m
SND_SOC_CS42L73 all=m
+SND_SOC_CS42L83 all=m
SND_SOC_CS4234 all=m
SND_SOC_CS4265 all=m
SND_SOC_CS4270 all=m
@@ -15213,6 +15258,7 @@ SND_SOC_SGTL5000 all=m
SND_SOC_SIMPLE_AMPLIFIER all=m
SND_SOC_SIMPLE_MUX all=m
SND_SOC_SPDIF all=m
+SND_SOC_SRC4XXX_I2C all=m
SND_SOC_SSM2305 all=m
SND_SOC_SSM2518=m
SND_SOC_SSM2602_SPI all=m
@@ -15504,6 +15550,7 @@ SND_SOC_SOF_DEBUG all=n
#-
SND_SOC_SOF_AMD_TOPLEVEL all=m
SND_SOC_SOF_AMD_RENOIR all=m
+SND_SOC_SOF_AMD_REMBRANDT all=m
#-
#- *** FILE: sound/soc/sof/imx/Kconfig ***
@@ -15517,6 +15564,8 @@ SND_SOC_SOF_INTEL_TOPLEVEL all=y
SND_SOC_SOF_BAYTRAIL all=m
SND_SOC_SOF_BROADWELL all=m
SND_SOC_SOF_MERRIFIELD all=m
+SND_SOC_SOF_SKYLAKE all=m
+SND_SOC_SOF_KABYLAKE all=m
SND_SOC_SOF_APOLLOLAKE all=m
SND_SOC_SOF_GEMINILAKE all=m
SND_SOC_SOF_CANNONLAKE all=m
@@ -15620,3 +15669,27 @@ RD_XZ all=y
RD_LZO all=y
RD_LZ4 all=y
RD_ZSTD all=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+BINFMT_AOUT alpha=m i386=m sparc=y
+DECNET all=m
+DECNET_NF_GRABULATOR all=m
+DECNET_ROUTER all=y
+DRM_DEBUG_SELFTEST all=n
+FIREWIRE_SERIAL all=m
+FWTTY_MAX_CARD_PORTS all=32
+FWTTY_MAX_TOTAL_PORTS all=64
+GPIO_ADP5588 all=m
+MEMCG_SWAP all=y
+MESON_EFUSE arm64=m
+MESON_MX_EFUSE arm64=m
+OSF4_COMPAT alpha=n
+RAVE_SP_EEPROM all=m
+ROCKCHIP_EFUSE arm64=m
+ROCKCHIP_OTP arm64=m
+SENSORS_ASUS_WMI_EC all=m
+SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
+SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
+SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
diff --git a/update-source.sh b/update-source.sh
index 9ee3197f..dfc06261 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -1,8 +1,8 @@
#!/bin/sh
set -xe
-BRANCH=aufs6.0
-#BRANCH=aufs6.x-rcN
+#BRANCH=aufs6.0
+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/2255d0fe9422b0018d3009c812d011f6fb781b56
More information about the pld-cvs-commit
mailing list