From 22319442c1ee05c9903a2c9cf29135dd44eab612 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 6 Aug 2022 23:20:22 +0200 Subject: [PATCH] up to 5.19.0 --- kernel-atmdd.patch | 2 +- kernel-aufs5.patch | 448 ++++++++++++++++++++-------------------- kernel-layer7.patch | 18 -- kernel-multiarch.config | 367 +++++++++++++++++++------------- kernel-x86.config | 17 +- kernel.spec | 11 +- 6 files changed, 472 insertions(+), 391 deletions(-) diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch index c0b9a361..c95aa581 100644 --- a/kernel-atmdd.patch +++ b/kernel-atmdd.patch @@ -949,5 +949,5 @@ diff -urN linux-5.9/drivers.org/atm/Makefile linux-5.9/drivers/atm/Makefile obj-$(CONFIG_ATM_DUMMY) += adummy.o +obj-$(CONFIG_ATM_DD) += atmdd.o obj-$(CONFIG_ATM_TCP) += atmtcp.o - obj-$(CONFIG_ATM_FIRESTREAM) += firestream.o obj-$(CONFIG_ATM_LANAI) += lanai.o + diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch index 72c144eb..9827e5c9 100644 --- a/kernel-aufs5.patch +++ b/kernel-aufs5.patch @@ -2,10 +2,10 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig -index 30b751c7f11a..fb8214374858 100644 +index 5976eb33535f..7dba4acf10ce 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -312,6 +312,7 @@ source "fs/sysv/Kconfig" +@@ -320,6 +320,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/erofs/Kconfig" source "fs/vboxsf/Kconfig" @@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN base patch diff --git a/MAINTAINERS b/MAINTAINERS -index 61d9f114c37f..95cb37e9c555 100644 +index 66bffb24a348..9dc7cad5fa1e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3323,6 +3323,19 @@ F: include/uapi/linux/audit.h +@@ -3355,6 +3355,19 @@ F: include/uapi/linux/audit.h F: kernel/audit* F: lib/*audit.c @@ -50,11 +50,11 @@ index 61d9f114c37f..95cb37e9c555 100644 M: Miguel Ojeda S: Maintained diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index a58595f5ee2c..ba35d0d6847a 100644 +index 084f9b8a0ba3..a705173cf452 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -635,6 +635,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, - return error; +@@ -645,6 +645,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + goto done; } +/* @@ -92,7 +92,7 @@ index 93f4f5ee07bf..cddcf2e44930 100644 { struct dentry *this_parent; diff --git a/fs/fcntl.c b/fs/fcntl.c -index f15d885b9796..d91d1bf393cc 100644 +index 34a3faa4886d..68457c0e1e6c 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -33,7 +33,7 @@ @@ -104,7 +104,7 @@ index f15d885b9796..d91d1bf393cc 100644 { struct inode * inode = file_inode(filp); int error = 0; -@@ -64,6 +64,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) +@@ -63,6 +63,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) if (filp->f_op->check_flags) error = filp->f_op->check_flags(arg); @@ -114,7 +114,7 @@ index f15d885b9796..d91d1bf393cc 100644 return error; diff --git a/fs/namespace.c b/fs/namespace.c -index a0a36bfa3aa0..7a54c6b514a2 100644 +index e6a7e769d25d..e0aa17f8c802 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -852,6 +852,12 @@ static inline int check_mnt(struct mount *mnt) @@ -159,10 +159,10 @@ index 047b79db8eb5..a21caa5c54c8 100644 unsigned int p_space; int ret; diff --git a/include/linux/fs.h b/include/linux/fs.h -index bbde95387a23..06c9242932a2 100644 +index 9ad5e3520fae..f5aed17b2ce2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1347,6 +1347,7 @@ extern void fasync_free(struct fasync_struct *); +@@ -1348,6 +1348,7 @@ extern void fasync_free(struct fasync_struct *); /* can be called from interrupts */ extern void kill_fasync(struct fasync_struct **, int, int); @@ -170,7 +170,7 @@ index bbde95387a23..06c9242932a2 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); -@@ -1979,6 +1980,7 @@ struct file_operations { +@@ -1986,6 +1987,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); @@ -178,7 +178,7 @@ index bbde95387a23..06c9242932a2 100644 int (*flock) (struct file *, int, struct file_lock *); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); -@@ -2486,6 +2488,7 @@ extern int current_umask(void); +@@ -2483,6 +2485,7 @@ extern int current_umask(void); extern void ihold(struct inode * inode); extern void iput(struct inode *); extern int generic_update_time(struct inode *, struct timespec64 *, int); @@ -186,7 +186,7 @@ index bbde95387a23..06c9242932a2 100644 /* /sys/fs */ extern struct kobject *fs_kobj; -@@ -2664,6 +2667,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) +@@ -2663,6 +2666,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) } void emergency_thaw_all(void); @@ -195,10 +195,10 @@ index bbde95387a23..06c9242932a2 100644 extern const struct file_operations def_blk_fops; extern const struct file_operations def_chr_fops; diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h -index 467b94257105..dab20282c82e 100644 +index b6829b970093..af63df9ba503 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h -@@ -248,6 +248,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, +@@ -244,6 +244,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, return lock->key == key; } @@ -243,10 +243,10 @@ index a55179fd60fc..8e21c53cf883 100644 + unsigned int flags); #endif diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index c06cab6546ed..9d7c317899e1 100644 +index f06b91ca6482..dedf7da3dd4a 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -187,7 +187,7 @@ unsigned long max_lock_class_idx; +@@ -217,7 +217,7 @@ unsigned long max_lock_class_idx; struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); @@ -255,7 +255,7 @@ index c06cab6546ed..9d7c317899e1 100644 { unsigned int class_idx = hlock->class_idx; -@@ -208,6 +208,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) +@@ -238,6 +238,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) */ return lock_classes + class_idx; } @@ -267,7 +267,7 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN mmap patch diff --git a/fs/proc/base.c b/fs/proc/base.c -index c1031843cc6a..6597f53969bf 100644 +index 8dfa36a99c74..548deeffe7d7 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2190,7 +2190,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -296,7 +296,7 @@ index 13452b32e2bd..38acccfef9d4 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index f46060eb91b5..2a7c8709acad 100644 +index 2d04e3470d4c..f57a3bed280a 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) @@ -311,7 +311,7 @@ index f46060eb91b5..2a7c8709acad 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1903,7 +1906,7 @@ static int show_numa_map(struct seq_file *m, void *v) +@@ -1908,7 +1911,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; @@ -337,10 +337,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 e34edb775334..08ac00a002a7 100644 +index cf3d0d673f6b..6b3c1bdf9cde 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1902,6 +1902,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1905,6 +1905,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -385,10 +385,10 @@ index e34edb775334..08ac00a002a7 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 8834e38c06a4..628b7d1eedbd 100644 +index c29ab4c0cd5c..51753b926421 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h -@@ -362,6 +362,9 @@ struct vm_region { +@@ -367,6 +367,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 */ @@ -398,7 +398,7 @@ index 8834e38c06a4..628b7d1eedbd 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 -@@ -458,6 +461,9 @@ struct vm_area_struct { +@@ -463,6 +466,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). */ @@ -409,10 +409,10 @@ index 8834e38c06a4..628b7d1eedbd 100644 #ifdef CONFIG_SWAP diff --git a/kernel/fork.c b/kernel/fork.c -index 9796897560ab..67c5046f47b8 100644 +index 9d44f2d46c69..089b21708b9a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -664,7 +664,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, +@@ -662,7 +662,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, if (file) { struct address_space *mapping = file->f_mapping; @@ -422,7 +422,7 @@ index 9796897560ab..67c5046f47b8 100644 if (tmp->vm_flags & VM_SHARED) mapping_allow_writable(mapping); diff --git a/mm/Makefile b/mm/Makefile -index 4cc13f3179a5..a1bbb3af3fc2 100644 +index 6f9ffa968a1a..f1e338fa3d10 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -133,3 +133,4 @@ obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o @@ -431,10 +431,10 @@ index 4cc13f3179a5..a1bbb3af3fc2 100644 obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o +obj-$(CONFIG_AUFS_FS:m=y) += prfile.o diff --git a/mm/filemap.c b/mm/filemap.c -index 3a5ffb5587cd..6d12a6337a60 100644 +index ffdfbc8b0e3c..2932f7020bfe 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -3422,7 +3422,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -3431,7 +3431,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); @@ -444,10 +444,10 @@ index 3a5ffb5587cd..6d12a6337a60 100644 if (folio->mapping != mapping) { folio_unlock(folio); diff --git a/mm/mmap.c b/mm/mmap.c -index 3aa839f81e63..9dfe979e8c2b 100644 +index 61e6135c54ef..9a3b117076a8 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -184,7 +184,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) +@@ -189,7 +189,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) @@ -456,7 +456,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 mpol_put(vma_policy(vma)); vm_area_free(vma); return next; -@@ -953,7 +953,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, +@@ -958,7 +958,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, if (remove_next) { if (file) { uprobe_munmap(next, next->vm_start, next->vm_end); @@ -465,7 +465,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 } if (next->anon_vma) anon_vma_merge(vma, next); -@@ -1877,7 +1877,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1889,7 +1889,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, return addr; unmap_and_free_vma: @@ -474,7 +474,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 vma->vm_file = NULL; /* Undo any partial mapping done by a device driver. */ -@@ -2737,7 +2737,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2751,7 +2751,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -483,7 +483,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2756,7 +2756,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2770,7 +2770,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) @@ -492,7 +492,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2929,6 +2929,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2943,6 +2943,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, unsigned long populate = 0; unsigned long ret = -EINVAL; struct file *file; @@ -502,7 +502,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -2984,10 +2987,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2998,10 +3001,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (vma->vm_flags & VM_LOCKED) flags |= MAP_LOCKED; @@ -537,7 +537,7 @@ index 3aa839f81e63..9dfe979e8c2b 100644 out: mmap_write_unlock(mm); if (populate) -@@ -3261,7 +3288,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3275,7 +3302,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) @@ -547,10 +547,10 @@ index 3aa839f81e63..9dfe979e8c2b 100644 new_vma->vm_ops->open(new_vma); vma_link(mm, new_vma, prev, rb_link, rb_parent); diff --git a/mm/nommu.c b/mm/nommu.c -index 55a9e48a7a02..8dc77ce96335 100644 +index 9d7afc2d959e..917851d5b7c6 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -522,7 +522,7 @@ static void __put_nommu_region(struct vm_region *region) +@@ -524,7 +524,7 @@ static void __put_nommu_region(struct vm_region *region) up_write(&nommu_region_sem); if (region->vm_file) @@ -559,7 +559,7 @@ index 55a9e48a7a02..8dc77ce96335 100644 /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -654,7 +654,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -656,7 +656,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) @@ -568,7 +568,7 @@ index 55a9e48a7a02..8dc77ce96335 100644 put_nommu_region(vma->vm_region); vm_area_free(vma); } -@@ -1174,7 +1174,7 @@ unsigned long do_mmap(struct file *file, +@@ -1176,7 +1176,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -577,7 +577,7 @@ index 55a9e48a7a02..8dc77ce96335 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1251,10 +1251,10 @@ unsigned long do_mmap(struct file *file, +@@ -1253,10 +1253,10 @@ unsigned long do_mmap(struct file *file, up_write(&nommu_region_sem); error: if (region->vm_file) @@ -706,7 +706,7 @@ index cddcf2e44930..8e24a158ef4f 100644 /** * d_ancestor - search for an ancestor diff --git a/fs/exec.c b/fs/exec.c -index e3e55d5e0be1..145d95db8bc9 100644 +index 0989fb8472a1..040741a7fc1a 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -111,6 +111,7 @@ bool path_noexec(const struct path *path) @@ -718,10 +718,10 @@ index e3e55d5e0be1..145d95db8bc9 100644 #ifdef CONFIG_USELIB /* diff --git a/fs/fcntl.c b/fs/fcntl.c -index d91d1bf393cc..3417421651d5 100644 +index 68457c0e1e6c..f6affcbcea4f 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c -@@ -86,6 +86,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) +@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, unsigned long arg) out: return error; } @@ -730,7 +730,7 @@ index d91d1bf393cc..3417421651d5 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 ada8fe814db9..4ebcd56ea4f0 100644 +index 5424e3a8df5f..d2fe19f88894 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) @@ -742,7 +742,7 @@ index ada8fe814db9..4ebcd56ea4f0 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 7a54c6b514a2..ddae5f68ac19 100644 +index e0aa17f8c802..a8c5bed09874 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -456,6 +456,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -770,7 +770,7 @@ index 7a54c6b514a2..ddae5f68ac19 100644 static void lock_mnt_tree(struct mount *mnt) { diff --git a/fs/notify/group.c b/fs/notify/group.c -index b7d4d64f87c2..2d2d2c6d33e4 100644 +index 1de6631a3925..3008eb37a18d 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group) @@ -782,7 +782,7 @@ index b7d4d64f87c2..2d2d2c6d33e4 100644 /* * Drop a reference to a group. Free it if it's through. diff --git a/fs/open.c b/fs/open.c -index 1315253e0247..46d9235f3a85 100644 +index 1d57fbde2feb..50d04ab40175 100644 --- a/fs/open.c +++ b/fs/open.c @@ -66,6 +66,7 @@ int do_truncate(struct user_namespace *mnt_userns, struct dentry *dentry, @@ -794,7 +794,7 @@ index 1315253e0247..46d9235f3a85 100644 long vfs_truncate(const struct path *path, loff_t length) { diff --git a/fs/read_write.c b/fs/read_write.c -index e643aec2b0ef..87acd61a0180 100644 +index e0777eefd846..5e4413802f73 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -489,6 +489,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -834,10 +834,10 @@ index a21caa5c54c8..ccf9e1681eb7 100644 /** * splice_direct_to_actor - splices data directly between two non-pipes diff --git a/fs/xattr.c b/fs/xattr.c -index 5c8c5175b385..ff7e9ff774b7 100644 +index e8dd03e4561e..fd922e39d42d 100644 --- a/fs/xattr.c +++ b/fs/xattr.c -@@ -384,6 +384,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry, +@@ -386,6 +386,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry, *xattr_value = value; return error; } @@ -846,10 +846,10 @@ index 5c8c5175b385..ff7e9ff774b7 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 9d7c317899e1..ddfdeeec39d6 100644 +index dedf7da3dd4a..2c74c70f4816 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -208,6 +208,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) +@@ -238,6 +238,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) */ return lock_classes + class_idx; } @@ -858,19 +858,19 @@ index 9d7c317899e1..ddfdeeec39d6 100644 #ifdef CONFIG_LOCK_STAT diff --git a/kernel/task_work.c b/kernel/task_work.c -index c59e1a49bc40..8af926a7276d 100644 +index dff75bcde151..30b814618535 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c -@@ -167,3 +167,4 @@ void task_work_run(void) +@@ -180,3 +180,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 b7cf5cbfdc67..37f2d9d3d08c 100644 +index 188b8f782220..6847a174a55f 100644 --- a/security/security.c +++ b/security/security.c -@@ -1164,6 +1164,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) +@@ -1165,6 +1165,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) return 0; return call_int_hook(path_rmdir, 0, dir, dentry); } @@ -878,7 +878,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_unlink(const struct path *dir, struct dentry *dentry) { -@@ -1180,6 +1181,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, +@@ -1181,6 +1182,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); } @@ -886,7 +886,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_link(struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry) -@@ -1188,6 +1190,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, +@@ -1189,6 +1191,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); } @@ -894,7 +894,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry, -@@ -1215,6 +1218,7 @@ int security_path_truncate(const struct path *path) +@@ -1209,6 +1212,7 @@ int security_path_truncate(const struct path *path) return 0; return call_int_hook(path_truncate, 0, path); } @@ -902,7 +902,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_chmod(const struct path *path, umode_t mode) { -@@ -1222,6 +1226,7 @@ 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) return 0; return call_int_hook(path_chmod, 0, path, mode); } @@ -910,7 +910,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) { -@@ -1229,6 +1234,7 @@ 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) return 0; return call_int_hook(path_chown, 0, path, uid, gid); } @@ -918,7 +918,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_path_chroot(const struct path *path) { -@@ -1329,6 +1335,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -1323,6 +1329,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return call_int_hook(inode_permission, 0, inode, mask); } @@ -926,7 +926,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -1526,6 +1533,7 @@ int security_file_permission(struct file *file, int mask) +@@ -1520,6 +1527,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -936,7 +936,7 @@ index b7cf5cbfdc67..37f2d9d3d08c 100644 { diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs --- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/ABI/testing/debugfs-aufs 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/ABI/testing/debugfs-aufs 2022-08-02 12:12:45.158975302 +0200 @@ -0,0 +1,55 @@ +What: /debug/aufs/si_/ +Date: March 2009 @@ -995,7 +995,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document + will be empty. About XINO files, see the aufs manual. diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs --- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/ABI/testing/sysfs-aufs 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/ABI/testing/sysfs-aufs 2022-08-02 12:12:45.158975302 +0200 @@ -0,0 +1,31 @@ +What: /sys/fs/aufs/si_/ +Date: March 2009 @@ -1030,7 +1030,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat + will be empty. About XINO files, see the aufs manual. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2022-08-02 12:12:45.158975302 +0200 @@ -0,0 +1,171 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1205,7 +1205,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin +about it. But currently I have implemented it in kernel space. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,258 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1467,7 +1467,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li +For this purpose, use "aumvdown" command in aufs-util.git. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,85 @@ + +# Copyright (C) 2015-2021 Junjiro R. Okajima @@ -1556,7 +1556,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t + be implemented in aufs, but not all I am afraid. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,113 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1673,7 +1673,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li + by over-mounting something (or another method). diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,74 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1751,7 +1751,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li + same named entry on the upper branch. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,64 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -1819,7 +1819,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx + copyup policy. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot linux/Documentation/filesystems/aufs/design/06dirren.dot --- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/06dirren.dot 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,31 @@ + +// to view this graph, run dot(1) command in GRAPHVIZ. @@ -1854,7 +1854,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li +} diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt linux/Documentation/filesystems/aufs/design/06dirren.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2022-03-21 14:49:05.713299677 +0100 ++++ linux/Documentation/filesystems/aufs/design/06dirren.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,102 @@ + +# Copyright (C) 2017-2021 Junjiro R. Okajima @@ -1935,7 +1935,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li +simply the inode-numbers on the branch. The file is created or updated +in removing the branch, and loaded in adding the branch. Its lifetime is +equal to the branch. -+The list is refered in lookup, and when the current target inode is ++The list is referred in lookup, and when the current target inode is +found in the list, the aufs tries loading the "detailed info per +directory" and get the changed and valid name of the dir. + @@ -1960,7 +1960,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li +equivalen to udba=reval case. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,120 @@ + +# Copyright (C) 2011-2021 Junjiro R. Okajima @@ -2084,7 +2084,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu +should restore the original file state after an error happens. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,72 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -2160,7 +2160,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu +I have to give up this "looks-smater" approach. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/06xattr.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,96 @@ + +# Copyright (C) 2014-2021 Junjiro R. Okajima @@ -2260,7 +2260,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin +now, aufs implements the branch attributes to ignore the error. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/07export.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/07export.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,58 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -2322,7 +2322,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li + lookup_one_len(), vfs_getattr(), encode_fh() and others. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,52 @@ + +# Copyright (C) 2005-2021 Junjiro R. Okajima @@ -2378,7 +2378,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu +initramfs will use it to replace the old one at the next boot. diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt --- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2022-03-21 14:49:05.716633010 +0100 ++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,47 @@ + +# Copyright (C) 2010-2021 Junjiro R. Okajima @@ -2429,8 +2429,8 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin +regular files only. diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README --- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100 -+++ linux/Documentation/filesystems/aufs/README 2022-03-21 14:49:05.713299677 +0100 -@@ -0,0 +1,396 @@ ++++ linux/Documentation/filesystems/aufs/README 2022-08-02 12:12:45.158975302 +0200 +@@ -0,0 +1,397 @@ + +Aufs5 -- advanced multi layered unification filesystem version 5.x +http://aufs.sf.net @@ -2810,6 +2810,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta +James Burry made a donation (2016/12). +Carsten Rose made a donation (2018/9). +Porteus Kiosk made a donation (2018/10). ++Enya Quetzalli Gomez Rodriguez made a donation (2022/5). + +Thank you very much. +Donations are always, including future donations, very important and @@ -2829,7 +2830,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta +# End: ; diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h --- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/aufs.h 2022-03-21 14:49:05.716633010 +0100 ++++ linux/fs/aufs/aufs.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -2895,7 +2896,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/branch.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,1427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -4178,7 +4179,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c + * file_release_write() for each file, because the branch + * attribute in aufs world is totally different from the native + * fs rw/ro mode. -+ */ ++ */ + /* fi_read_lock(file); */ + hfile = &au_fi(file)->fi_htop; + hf = hfile->hf_file; @@ -4326,7 +4327,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c +} diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h --- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/branch.h 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/branch.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,375 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -4705,7 +4706,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h +#endif /* __AUFS_BRANCH_H__ */ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk --- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/conf.mk 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/conf.mk 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -4749,7 +4750,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/cpup.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,1459 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6212,7 +6213,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/cpup.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6316,7 +6317,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dbgaufs.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -6846,7 +6847,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c +} diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h --- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dbgaufs.h 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dbgaufs.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -6903,7 +6904,7 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h +#endif /* __DBGAUFS_H__ */ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c --- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dcsub.c 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dcsub.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -7132,7 +7133,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c +} diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h --- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dcsub.h 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dcsub.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -7273,7 +7274,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/debug.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,444 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -7324,7 +7325,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c + return sprintf(buffer, "%d", atomic_read(a)); +} + -+static struct kernel_param_ops param_ops_atomic_t = { ++static const struct kernel_param_ops param_ops_atomic_t = { + .set = param_atomic_t_set, + .get = param_atomic_t_get + /* void (*free)(void *arg) */ @@ -7721,7 +7722,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c +} diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h --- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/debug.h 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/debug.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,226 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -7951,7 +7952,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dentry.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,1168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9123,7 +9124,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 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dentry.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,269 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -9396,7 +9397,7 @@ 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-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dinfo.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,554 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9954,7 +9955,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-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dir.c 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,765 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -10723,7 +10724,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c +}; diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h --- /usr/share/empty/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dir.h 2022-03-21 14:49:05.719966344 +0100 ++++ linux/fs/aufs/dir.h 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -10861,7 +10862,7 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h +#endif /* __AUFS_DIR_H__ */ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c --- /usr/share/empty/fs/aufs/dirren.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dirren.c 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/dirren.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,1315 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -12180,7 +12181,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c +} diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h --- /usr/share/empty/fs/aufs/dirren.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dirren.h 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/dirren.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -12324,8 +12325,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 2022-05-23 09:44:37.726505832 +0200 -@@ -0,0 +1,367 @@ ++++ linux/fs/aufs/dynop.c 2022-08-02 12:12:45.165641939 +0200 +@@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2010-2021 Junjiro R. Okajima @@ -12504,7 +12505,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c + AuDbg("%s\n", au_sbtype(h_sb)); + + DySetAop(writepage); -+ DySetAopForce(readpage); /* force */ ++ DySetAopForce(read_folio); /* force */ + DySetAop(writepages); + DySetAop(dirty_folio); + DySetAop(invalidate_folio); @@ -12512,8 +12513,8 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c + DySetAop(write_begin); + DySetAop(write_end); + DySetAop(bmap); -+ DySetAop(releasepage); -+ DySetAop(freepage); ++ DySetAop(release_folio); ++ DySetAop(free_folio); + /* this one will be changed according to an aufs mount option */ + DySetAop(direct_IO); + DySetAop(migratepage); @@ -12525,6 +12526,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c + DySetAop(error_remove_page); + DySetAop(swap_activate); + DySetAop(swap_deactivate); ++ DySetAop(swap_rw); + + DyDbgSize(cnt, *h_aop); +} @@ -12695,7 +12697,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c +} diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h --- /usr/share/empty/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/dynop.h 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/dynop.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -12776,7 +12778,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-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/export.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -13610,7 +13612,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c +} diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c --- /usr/share/empty/fs/aufs/fhsm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/fhsm.c 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/fhsm.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -14041,8 +14043,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-05-23 09:44:37.729839166 +0200 -@@ -0,0 +1,861 @@ ++++ linux/fs/aufs/file.c 2022-08-02 12:12:45.165641939 +0200 +@@ -0,0 +1,864 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2021 Junjiro R. Okajima @@ -14823,9 +14825,9 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c + +/* cf. aufs_nopage() */ +/* for madvise(2) */ -+static int aufs_readpage(struct file *file __maybe_unused, struct page *page) ++static int aufs_read_folio(struct file *file __maybe_unused, struct folio *folio) +{ -+ unlock_page(page); ++ folio_unlock(folio); + return 0; +} + @@ -14836,7 +14838,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c +/* they will never be called. */ +#ifdef CONFIG_AUFS_DEBUG +static int aufs_write_begin(struct file *file, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned flags, ++ loff_t pos, unsigned len, + struct page **pagep, void **fsdata) +{ AuUnsupport(); return 0; } +static int aufs_write_end(struct file *file, struct address_space *mapping, @@ -14850,8 +14852,8 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c +{ AuUnsupport(); return true; } +static void aufs_invalidate_folio(struct folio *folio, size_t offset, size_t len) +{ AuUnsupport(); } -+static int aufs_releasepage(struct page *page, gfp_t gfp) -+{ AuUnsupport(); return 0; } ++static bool aufs_release_folio(struct folio *folio, gfp_t gfp) ++{ AuUnsupport(); return true; } +#if 0 /* called by memory compaction regardless file */ +static int aufs_migratepage(struct address_space *mapping, struct page *newpage, + struct page *page, enum migrate_mode mode) @@ -14866,7 +14868,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c +static bool aufs_is_partially_uptodate(struct folio *folio, size_t from, + size_t count) +{ AuUnsupport(); return true; } -+static void aufs_is_dirty_writeback(struct page *page, bool *dirty, ++static void aufs_is_dirty_writeback(struct folio *folio, bool *dirty, + bool *writeback) +{ AuUnsupport(); } +static int aufs_error_remove_page(struct address_space *mapping, @@ -14877,10 +14879,12 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c +{ AuUnsupport(); return 0; } +static void aufs_swap_deactivate(struct file *file) +{ AuUnsupport(); } ++static int aufs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) ++{ AuUnsupport(); return 0; } +#endif /* CONFIG_AUFS_DEBUG */ + +const struct address_space_operations aufs_aop = { -+ .readpage = aufs_readpage, ++ .read_folio = aufs_read_folio, + .direct_IO = aufs_direct_IO, +#ifdef CONFIG_AUFS_DEBUG + .writepage = aufs_writepage, @@ -14891,7 +14895,7 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c + .write_end = aufs_write_end, + /* no bmap, no block device */ + .invalidate_folio = aufs_invalidate_folio, -+ .releasepage = aufs_releasepage, ++ .release_folio = aufs_release_folio, + /* is fallback_migrate_page ok? */ + /* .migratepage = aufs_migratepage, */ + .isolate_page = aufs_isolate_page, @@ -14901,12 +14905,13 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c + .is_dirty_writeback = aufs_is_dirty_writeback, + .error_remove_page = aufs_error_remove_page, + .swap_activate = aufs_swap_activate, -+ .swap_deactivate = aufs_swap_deactivate ++ .swap_deactivate = aufs_swap_deactivate, ++ .swap_rw = aufs_swap_rw +#endif /* CONFIG_AUFS_DEBUG */ +}; diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h --- /usr/share/empty/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/file.h 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/file.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,342 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -15252,7 +15257,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 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/finfo.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -15405,7 +15410,7 @@ 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-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/f_op.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,771 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16180,7 +16185,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 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/fsctx.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,1242 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -16625,7 +16630,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c +#ifdef CONFIG_FS_POSIX_ACL + fsparam_flag_no("acl", Opt_acl), +#else -+ au_ignore_flag("acl"), ++ au_ignore_flag("acl", Opt_ignore), +#endif + + /* internal use for the scripts */ @@ -17187,7 +17192,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c + case Opt_##name: \ + err = 0; \ + opt->tf = !result.negated; \ -+ break; ++ break + au_fsctx_TF(trunc_xino); + au_fsctx_TF(trunc_xib); + au_fsctx_TF(dirperm1); @@ -17264,7 +17269,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c +{ +#define do_test(name) \ + if (!strncmp(str, name ":", sizeof(name))) \ -+ return sizeof(name) - 1; ++ return sizeof(name) - 1 + do_test("br"); + do_test("add"); + do_test("ins"); @@ -17426,7 +17431,7 @@ diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c +} diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h --- /usr/share/empty/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/fstype.h 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/fstype.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,401 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -17831,7 +17836,7 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h +#endif /* __AUFS_FSTYPE_H__ */ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h --- /usr/share/empty/fs/aufs/hbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/hbl.h 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/hbl.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -17900,8 +17905,8 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h +#endif /* __AUFS_HBL_H__ */ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c --- /usr/share/empty/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/hfsnotify.c 2022-03-21 14:49:05.723299677 +0100 -@@ -0,0 +1,289 @@ ++++ linux/fs/aufs/hfsnotify.c 2022-08-02 12:12:45.165641939 +0200 +@@ -0,0 +1,290 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2021 Junjiro R. Okajima @@ -18143,7 +18148,8 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c + goto out; + + err = 0; -+ group = fsnotify_alloc_group(&au_hfsn_ops); ++ group = fsnotify_alloc_group(&au_hfsn_ops, ++ /*flags - not for userspace*/0); + if (IS_ERR(group)) { + err = PTR_ERR(group); + pr_err("fsnotify_alloc_group() failed, %d\n", err); @@ -18193,7 +18199,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c +}; diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c --- /usr/share/empty/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/hfsplus.c 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/hfsplus.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18257,7 +18263,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 2022-03-21 14:49:05.723299677 +0100 ++++ linux/fs/aufs/hnotify.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,715 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -18976,7 +18982,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c +} diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c --- /usr/share/empty/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/iinfo.c 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/iinfo.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19266,7 +19272,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 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/inode.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,531 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -19801,7 +19807,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-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/inode.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,705 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -20510,7 +20516,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h +#endif /* __AUFS_INODE_H__ */ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c --- /usr/share/empty/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/ioctl.c 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/ioctl.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -20734,7 +20740,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 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/i_op_add.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,941 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -21679,7 +21685,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 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/i_op.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,1512 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -23195,7 +23201,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c +}; diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c --- /usr/share/empty/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/i_op_del.c 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/i_op_del.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,522 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -23721,7 +23727,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 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/i_op_ren.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,1257 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24982,7 +24988,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 2022-03-21 14:49:05.716633010 +0100 ++++ linux/fs/aufs/Kconfig 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,199 @@ +# SPDX-License-Identifier: GPL-2.0 +config AUFS_FS @@ -25110,7 +25116,7 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig + his child on the lower branch, since it is a bad idea to issue + rename(2) internally for every lower branch. But user may not + accept this behaviour. So here is a workaround to allow such -+ rename(2) and store some extra infromation on the writable ++ rename(2) and store some extra information on the writable + branch. Obviously this costs high (and I don't like it). + To use this feature, you need to enable this configuration AND + to specify the mount option `dirren.' @@ -25185,7 +25191,7 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig +endif diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h --- /usr/share/empty/fs/aufs/lcnt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/lcnt.h 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/lcnt.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,186 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25375,7 +25381,7 @@ diff -urN /usr/share/empty/fs/aufs/lcnt.h linux/fs/aufs/lcnt.h +#endif /* __AUFS_LCNT_H__ */ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c --- /usr/share/empty/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/loop.c 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/loop.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25527,7 +25533,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c +} diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h --- /usr/share/empty/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/loop.h 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/loop.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25586,7 +25592,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h +#endif /* __AUFS_LOOP_H__ */ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk --- /usr/share/empty/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/magic.mk 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/magic.mk 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -25621,7 +25627,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 2022-03-21 14:49:05.716633010 +0100 ++++ linux/fs/aufs/Makefile 2022-08-02 12:12:45.162308621 +0200 @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -25671,7 +25677,7 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c --- /usr/share/empty/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/module.c 2022-03-21 14:49:05.726633010 +0100 ++++ linux/fs/aufs/module.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25948,7 +25954,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 2022-05-23 09:44:37.729839166 +0200 ++++ linux/fs/aufs/module.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,180 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -26132,7 +26138,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 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/mvdown.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,706 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26842,7 +26848,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 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/opts.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,1032 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27878,7 +27884,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 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/opts.h 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,263 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28145,7 +28151,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h +#endif /* __AUFS_OPTS_H__ */ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c --- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/plink.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/plink.c 2022-08-02 12:12:45.165641939 +0200 @@ -0,0 +1,516 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28665,7 +28671,7 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c +} diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c --- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/poll.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/poll.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28720,7 +28726,7 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c +} diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c --- /usr/share/empty/fs/aufs/posix_acl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/posix_acl.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/posix_acl.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28835,7 +28841,7 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c +} diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c --- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/procfs.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/procfs.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29009,7 +29015,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-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/rdu.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,384 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29397,7 +29403,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 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/rwsem.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -29486,7 +29492,7 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h +#endif /* __AUFS_RWSEM_H__ */ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c --- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/sbinfo.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/sbinfo.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,316 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -29806,7 +29812,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 2022-05-23 09:44:37.729839166 +0200 ++++ linux/fs/aufs/super.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,871 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -30681,7 +30687,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 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/super.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,592 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -31277,7 +31283,7 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h +#endif /* __AUFS_SUPER_H__ */ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c --- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/sysaufs.c 2022-05-23 09:44:37.729839166 +0200 ++++ linux/fs/aufs/sysaufs.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31375,7 +31381,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c +} diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h --- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/sysaufs.h 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/sysaufs.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -31481,7 +31487,7 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h +#endif /* __SYSAUFS_H__ */ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c --- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/sysfs.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/sysfs.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -31859,7 +31865,7 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c +} diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c --- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/sysrq.c 2022-03-21 14:49:05.729966343 +0100 ++++ linux/fs/aufs/sysrq.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32012,7 +32018,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-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/vdir.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,896 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -32912,7 +32918,7 @@ 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 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/vfsub.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,918 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -33834,7 +33840,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 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/vfsub.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,358 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -34196,7 +34202,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 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/wbr_policy.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,830 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -35030,7 +35036,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 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/whout.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,1072 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36106,7 +36112,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c +} diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h --- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/whout.h 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/whout.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,87 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -36197,7 +36203,7 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h +#endif /* __AUFS_WHOUT_H__ */ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c --- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/wkq.c 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/wkq.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,372 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -36573,7 +36579,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 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/wkq.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -36666,7 +36672,7 @@ 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-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/xattr.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,368 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -37038,7 +37044,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c +} diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c --- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux/fs/aufs/xino.c 2022-03-21 14:49:05.733299677 +0100 ++++ linux/fs/aufs/xino.c 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,1926 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -38968,7 +38974,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-05-23 09:44:37.729839166 +0200 ++++ linux/include/uapi/linux/aufs_type.h 2022-08-02 12:12:45.168975258 +0200 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -39012,7 +39018,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin +#include +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.x-rcN-20220418" ++#define AUFS_VERSION "5.x-rcN-20220711" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') @@ -39426,10 +39432,19 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN loopback patch diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index ba35d0d6847a..63e256b40842 100644 +index a705173cf452..642a93f4fdee 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -509,6 +509,15 @@ static inline void loop_update_dio(struct loop_device *lo) +@@ -54,7 +54,7 @@ struct loop_device { + int lo_flags; + char lo_file_name[LO_NAME_SIZE]; + +- struct file * lo_backing_file; ++ struct file *lo_backing_file, *lo_backing_virt_file; + struct block_device *lo_device; + + gfp_t old_gfp_mask; +@@ -510,6 +510,15 @@ static inline void loop_update_dio(struct loop_device *lo) lo->use_dio); } @@ -39445,7 +39460,7 @@ index ba35d0d6847a..63e256b40842 100644 static void loop_reread_partitions(struct loop_device *lo) { int rc; -@@ -566,6 +575,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, +@@ -567,6 +576,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, { struct file *file = fget(arg); struct file *old_file; @@ -39453,7 +39468,7 @@ index ba35d0d6847a..63e256b40842 100644 int error; bool partscan; bool is_loop; -@@ -585,11 +595,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, +@@ -590,11 +600,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; @@ -39473,7 +39488,7 @@ index ba35d0d6847a..63e256b40842 100644 error = -EINVAL; -@@ -602,6 +620,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, +@@ -607,6 +625,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, blk_mq_freeze_queue(lo->lo_queue); mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask); lo->lo_backing_file = file; @@ -39481,7 +39496,7 @@ index ba35d0d6847a..63e256b40842 100644 lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping); mapping_set_gfp_mask(file->f_mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); -@@ -624,6 +643,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, +@@ -629,6 +648,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, * dependency. */ fput(old_file); @@ -39489,17 +39504,17 @@ index ba35d0d6847a..63e256b40842 100644 + fput(old_virt_file); if (partscan) loop_reread_partitions(lo); - return 0; -@@ -632,6 +653,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + +@@ -642,6 +663,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, loop_global_unlock(lo, is_loop); out_putf: fput(file); + if (virt_file) + fput(virt_file); - return error; + goto done; } -@@ -970,6 +993,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, +@@ -1008,6 +1031,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, const struct loop_config *config) { struct file *file = fget(config->fd); @@ -39507,9 +39522,9 @@ index ba35d0d6847a..63e256b40842 100644 struct inode *inode; struct address_space *mapping; int error; -@@ -985,6 +1009,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, - /* This is safe, since we have a reference from open(). */ - __module_get(THIS_MODULE); +@@ -1026,6 +1050,13 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, + /* suppress uevents while reconfiguring the device */ + dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1); + f = loop_real_file(file); + if (f) { @@ -39521,7 +39536,7 @@ index ba35d0d6847a..63e256b40842 100644 /* * If we don't hold exclusive handle for the device, upgrade to it * here to avoid changing device under exclusive owner. -@@ -1050,6 +1081,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, +@@ -1086,6 +1117,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->lo_device = bdev; lo->lo_backing_file = file; @@ -39529,7 +39544,7 @@ index ba35d0d6847a..63e256b40842 100644 lo->old_gfp_mask = mapping_gfp_mask(mapping); mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); -@@ -1100,6 +1132,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, +@@ -1141,6 +1173,8 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, bd_abort_claiming(bdev, loop_configure); out_putf: fput(file); @@ -39537,16 +39552,16 @@ index ba35d0d6847a..63e256b40842 100644 + fput(virt_file); /* This is safe: open() is still holding a reference. */ module_put(THIS_MODULE); - return error; -@@ -1108,6 +1142,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, + goto done; +@@ -1149,6 +1183,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, static void __loop_clr_fd(struct loop_device *lo, bool release) { struct file *filp; + struct file *virt_filp = lo->lo_backing_virt_file; gfp_t gfp = lo->old_gfp_mask; - struct loop_worker *pos, *worker; -@@ -1153,6 +1188,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) + if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags)) +@@ -1165,6 +1200,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) spin_lock_irq(&lo->lo_lock); filp = lo->lo_backing_file; lo->lo_backing_file = NULL; @@ -39554,7 +39569,7 @@ index ba35d0d6847a..63e256b40842 100644 spin_unlock_irq(&lo->lo_lock); lo->lo_device = NULL; -@@ -1214,6 +1250,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) +@@ -1227,6 +1263,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) * fput can take open_mutex which is usually taken before lo_mutex. */ fput(filp); @@ -39563,19 +39578,6 @@ index ba35d0d6847a..63e256b40842 100644 } static int loop_clr_fd(struct loop_device *lo) -diff --git a/drivers/block/loop.h b/drivers/block/loop.h -index 082d4b6bfc6a..61feca64688d 100644 ---- a/drivers/block/loop.h -+++ b/drivers/block/loop.h -@@ -34,7 +34,7 @@ struct loop_device { - int lo_flags; - char lo_file_name[LO_NAME_SIZE]; - -- struct file * lo_backing_file; -+ struct file *lo_backing_file, *lo_backing_virt_file; - struct block_device *lo_device; - - gfp_t old_gfp_mask; diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c index 99ceca144044..e49dfe855032 100644 --- a/fs/aufs/f_op.c @@ -39652,10 +39654,10 @@ index 7d9bcc074c87..0eefe350c01c 100644 /* ---------------------------------------------------------------------- */ diff --git a/include/linux/fs.h b/include/linux/fs.h -index 06c9242932a2..9190ce754010 100644 +index f5aed17b2ce2..6b2d2256be5f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -2113,6 +2113,10 @@ struct super_operations { +@@ -2121,6 +2121,10 @@ struct super_operations { struct shrink_control *); long (*free_cached_objects)(struct super_block *, struct shrink_control *); diff --git a/kernel-layer7.patch b/kernel-layer7.patch index 8f90bad9..767ff1f4 100644 --- a/kernel-layer7.patch +++ b/kernel-layer7.patch @@ -83,24 +83,6 @@ diff -urNp -x '*.orig' linux-5.11/net/netfilter/Makefile linux-5.11/net/netfilte obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o -diff -urNp -x '*.orig' linux-5.11/net/netfilter/nf_conntrack_core.c linux-5.11/net/netfilter/nf_conntrack_core.c ---- linux-5.11/net/netfilter/nf_conntrack_core.c 2021-02-14 23:32:24.000000000 +0100 -+++ linux-5.11/net/netfilter/nf_conntrack_core.c 2021-02-24 13:21:48.335107407 +0100 -@@ -528,6 +528,14 @@ static void nf_ct_del_from_dying_or_unco - { - struct ct_pcpu *pcpu; - -+ #if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE) -+ if(ct->layer7.app_proto) -+ kfree(ct->layer7.app_proto); -+ if(ct->layer7.app_data) -+ kfree(ct->layer7.app_data); -+ #endif -+ -+ - /* We overload first tuple to link into unconfirmed list.*/ - pcpu = per_cpu_ptr(nf_ct_net(ct)->ct.pcpu_lists, ct->cpu); - diff -urNp -x '*.orig' linux-5.11/net/netfilter/nf_conntrack_standalone.c linux-5.11/net/netfilter/nf_conntrack_standalone.c --- linux-5.11/net/netfilter/nf_conntrack_standalone.c 2021-02-14 23:32:24.000000000 +0100 +++ linux-5.11/net/netfilter/nf_conntrack_standalone.c 2021-02-24 13:21:48.338440845 +0100 diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 9d7e797a..424e92cf 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -3,6 +3,7 @@ #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS *** #- ACRN_GUEST all=y +ARCH_CPUIDLE_HALTPOLL all=y ARCH_MEMORY_PROBE all=n ARM64_RELOC_TEST arm64=m ARM_KPROBES_TEST arm=m @@ -38,7 +39,6 @@ KEXEC_SIG all=n KPROBES arm=y arm64=y LOCK_EVENT_COUNTS all=n LTO_NONE all=y -MICROCODE_OLD_INTERFACE all=n PAGE_TABLE_ISOLATION all=y PERF_EVENTS_AMD_POWER all=m PERF_EVENTS_AMD_UNCORE all=m @@ -160,6 +160,7 @@ SECONDARY_TRUSTED_KEYRING all=y SYSTEM_BLACKLIST_KEYRING all=y SYSTEM_BLACKLIST_HASH_LIST all="" SYSTEM_REVOCATION_LIST all=n +SYSTEM_BLACKLIST_AUTH_UPDATE all=y #- #- *** FILE: crypto/Kconfig *** @@ -231,6 +232,7 @@ CRYPTO_BLAKE2S all=m CRYPTO_BLAKE2S_X86 all=m CRYPTO_CRCT10DIF all=y CRYPTO_CRCT10DIF_PCLMUL all=m +CRYPTO_CRC64_ROCKSOFT all=m CRYPTO_GHASH all=m CRYPTO_POLY1305 all=m CRYPTO_POLY1305_X86_64 all=m @@ -246,6 +248,7 @@ 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_WP512 all=m @@ -279,6 +282,7 @@ 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 @@ -323,6 +327,7 @@ PKCS8_PRIVATE_KEY_PARSER all=m PKCS7_MESSAGE_PARSER all=y PKCS7_TEST_KEY all=m SIGNED_PE_FILE_VERIFICATION all=y +FIPS_SIGNATURE_SELFTEST all=y #- #- *** FILE: drivers/accessibility/Kconfig *** @@ -551,9 +556,6 @@ ATM_LANAI all=m sparc=n ATM_ENI all=m sparc=n ATM_ENI_DEBUG all=n ATM_ENI_TUNE_BURST all=n -ATM_FIRESTREAM all=m sparc64=n -ATM_ZATM all=m sparc64=n -ATM_ZATM_DEBUG all=n ATM_NICSTAR all=m ATM_NICSTAR_USE_SUNI all=y ATM_NICSTAR_USE_IDT77105 all=y @@ -561,10 +563,6 @@ ATM_IDT77252 all=m sparc=n ATM_IDT77252_DEBUG all=n ATM_IDT77252_RCV_ALL all=n ATM_IDT77252_USE_SUNI all=y -ATM_AMBASSADOR all=m sparc=n -ATM_AMBASSADOR_DEBUG all=n -ATM_HORIZON all=m sparc=n -ATM_HORIZON_DEBUG all=n ATM_IA all=m sparc=n ATM_IA_DEBUG all=n ATM_FORE200E all=m @@ -624,7 +622,10 @@ EXTRA_FIRMWARE all="" FW_LOADER_USER_HELPER all=y FW_LOADER_USER_HELPER_FALLBACK all=n FW_LOADER_COMPRESS all=y +FW_LOADER_COMPRESS_XZ all=y +FW_LOADER_COMPRESS_ZSTD all=n FW_CACHE all=y +FW_UPLOAD all=y #- #- *** FILE: drivers/base/regmap/Kconfig *** @@ -791,6 +792,11 @@ VEXPRESS_CONFIG arm=m arm64=y #- file drivers/bus/fsl-mc/Kconfig goes here #- file drivers/bus/mhi/Kconfig goes here +#- +#- *** FILE: drivers/bus/mhi/ep/Kconfig *** +#- +MHI_BUS_EP all=m + #- #- *** FILE: drivers/bus/mhi/host/Kconfig *** #- @@ -1635,6 +1641,7 @@ EFI_VARS_PSTORE_DEFAULT_DISABLE all=n EFI_RUNTIME_MAP all=y EFI_FAKE_MEMMAP all=n EFI_SOFT_RESERVE all=y +EFI_DXE_MEM_ATTRIBUTES all=y EFI_ARMSTUB_DTB_LOADER arm64=y EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER arm64=y EFI_BOOTLOADER_CONTROL all=m @@ -1646,6 +1653,7 @@ EFI_RCI2_TABLE all=y EFI_DISABLE_PCI_DMA all=n EFI_CUSTOM_SSDT_OVERLAYS all=y EFI_DISABLE_RUNTIME all=n +EFI_COCO_SECRET all=y #- #- *** FILE: drivers/firmware/google/Kconfig *** @@ -1834,12 +1842,11 @@ GPIO_SIM all=m #- *** FILE: drivers/gpu/drm/Kconfig *** #- DRM all=m -DRM_DP_AUX_CHARDEV all=y DRM_DEBUG_SELFTEST all=n DRM_FBDEV_EMULATION all=y DRM_FBDEV_OVERALLOC all=100 DRM_LOAD_EDID_FIRMWARE all=y -DRM_DP_CEC all=y +#- file drivers/gpu/drm/display/Kconfig goes here #- file drivers/gpu/drm/i2c/Kconfig goes here #- file drivers/gpu/drm/arm/Kconfig goes here DRM_RADEON all=m @@ -2029,6 +2036,12 @@ DRM_DW_HDMI_AHB_AUDIO arm=m arm64=m DRM_DW_HDMI_I2S_AUDIO arm=m arm64=m DRM_DW_HDMI_CEC arm=m arm64=m +#- +#- *** FILE: drivers/gpu/drm/display/Kconfig *** +#- +DRM_DP_AUX_CHARDEV all=y +DRM_DP_CEC all=y + #- #- *** FILE: drivers/gpu/drm/etnaviv/Kconfig *** #- @@ -2287,6 +2300,7 @@ ROCKCHIP_RK3066_HDMI arm64=n #- DRM_SSD130X all=m DRM_SSD130X_I2C all=m +DRM_SSD130X_SPI all=m #- #- *** FILE: drivers/gpu/drm/sti/Kconfig *** @@ -2446,6 +2460,7 @@ HID_JABRA all=m HID_TWINHAN all=m HID_KENSINGTON all=m HID_LCPOWER all=m +HID_LED all=m HID_LENOVO all=m HID_LETSKETCH all=m HID_LOGITECH all=m @@ -2458,6 +2473,7 @@ LOGIWHEELS_FF all=y HID_MAGICMOUSE all=m HID_MALTRON all=m HID_MAYFLASH all=m +HID_MEGAWORLD_FF all=m HID_REDRAGON all=m HID_MICROSOFT all=m HID_MONTEREY all=m @@ -2569,6 +2585,11 @@ HSI all=m #- HSI clients HSI_CHAR all=m +#- +#- *** FILE: drivers/hte/Kconfig *** +#- +HTE all=y + #- #- *** FILE: drivers/hv/Kconfig *** #- @@ -2699,6 +2720,7 @@ SENSORS_PC87427 all=m SENSORS_NTC_THERMISTOR all=m SENSORS_NCT6683 all=m SENSORS_NCT6775 all=m +SENSORS_NCT6775_I2C all=m SENSORS_NCT7802 all=m SENSORS_NCT7904 all=m SENSORS_NPCM7XX all=m @@ -2835,6 +2857,7 @@ SENSORS_TPS40422 all=m SENSORS_TPS53679 all=m SENSORS_UCD9000 all=m SENSORS_UCD9200 all=m +SENSORS_XDPE152 all=m SENSORS_XDPE122 all=m SENSORS_XDPE122_REGULATOR all=y SENSORS_ZL6100 all=m @@ -3070,7 +3093,7 @@ BMC150_ACCEL all=m BMI088_ACCEL all=m DA280 all=m DA311 all=m -DMARD06 arm=m arm64=m +DMARD06 all=m DMARD09 all=m DMARD10 all=m FXLS8962AF_I2C=m @@ -3189,7 +3212,7 @@ AD74413R all=m #- #- *** FILE: drivers/iio/afe/Kconfig *** #- -IIO_RESCALE arm=m arm64=m +IIO_RESCALE all=m #- #- *** FILE: drivers/iio/amplifiers/Kconfig *** @@ -3275,7 +3298,7 @@ AD7293 all=m AD7303 all=m AD8801 all=m CIO_DAC all=m -DPOT_DAC arm=m arm64=m +DPOT_DAC all=m DS4424 all=m LTC1660 all=m LTC2632 all=m @@ -3288,7 +3311,7 @@ TI_DAC082S085 all=m TI_DAC5571 all=m TI_DAC7311 all=m TI_DAC7612 all=m -VF610_DAC arm=m arm64=m +VF610_DAC all=m #- #- *** FILE: drivers/iio/dummy/Kconfig *** @@ -3417,7 +3440,7 @@ BH1780 all=m CM32181 all=m CM3232 all=m CM3323 all=m -CM3605 arm=m arm64=m +CM3605 all=m CM36651 all=m IIO_CROS_EC_LIGHT_PROX all=m GP2AP002 all=m @@ -3460,7 +3483,7 @@ ZOPT2201 all=m #- #- *** FILE: drivers/iio/magnetometer/Kconfig *** #- -AK8974 arm=m arm64=m +AK8974 all=m AK8975 all=m AK09911 all=m BMC150_MAGN all=m @@ -3480,7 +3503,7 @@ YAMAHA_YAS530 all=m #- #- *** FILE: drivers/iio/multiplexer/Kconfig *** #- -IIO_MUX arm=m arm64=m +IIO_MUX all=m #- #- *** FILE: drivers/iio/orientation/Kconfig *** @@ -3826,6 +3849,7 @@ JOYSTICK_PSXPAD_SPI_FF all=y JOYSTICK_PXRC all=m JOYSTICK_QWIIC=m JOYSTICK_FSIA6B all=m +JOYSTICK_SENSEHAT all=m #- #- *** FILE: drivers/input/joystick/iforce/Kconfig *** @@ -3935,6 +3959,7 @@ INPUT_ADXL34X_SPI all=m INPUT_IMS_PCU all=m INPUT_IQS269A all=m INPUT_IQS626A all=m +INPUT_IQS7222 all=m INPUT_CMA3000 all=m INPUT_CMA3000_I2C all=m INPUT_XEN_KBDDEV_FRONTEND all=m @@ -4323,6 +4348,8 @@ LEDS_TPS6105X all=m #- file drivers/leds/blink/Kconfig goes here #- Flash and Torch LED drivers #- file drivers/leds/flash/Kconfig goes here +#- RGB LED drivers +#- file drivers/leds/rgb/Kconfig goes here #- LED Triggers #- file drivers/leds/trigger/Kconfig goes here #- Simple LED drivers @@ -4341,6 +4368,11 @@ LEDS_RT4505 arm=m arm64=m LEDS_RT8515 all=m LEDS_SGM3140 all=m +#- +#- *** FILE: drivers/leds/rgb/Kconfig *** +#- +LEDS_PWM_MULTICOLOR all=m + #- #- *** FILE: drivers/leds/simple/Kconfig *** #- @@ -5867,6 +5899,7 @@ SENSORS_LIS3_I2C all=m INTEL_MEI all=m INTEL_MEI_ME all=m INTEL_MEI_TXE all=m +INTEL_MEI_GSC all=m #- file drivers/misc/mei/hdcp/Kconfig goes here #- file drivers/misc/mei/pxp/Kconfig goes here @@ -6288,7 +6321,6 @@ NET_FAILOVER all=m #- ATALK all=m DEV_APPLETALK all=m -LTPC alpha=m i386=m COPS alpha=m i386=m COPS_DAYNA alpha=y i386=y COPS_TANGENT alpha=y i386=y @@ -6326,7 +6358,6 @@ CAN_VXCAN all=m CAN_SLCAN all=m CAN_DEV all=m CAN_CALC_BITTIMING all=y -CAN_LEDS all=y CAN_FLEXCAN arm=m arm64=m CAN_GRCAN arm=m arm64=m CAN_JANZ_ICAN3 all=m @@ -6336,6 +6367,7 @@ CAN_XILINXCAN arm64=m PCH_CAN all=m #- file drivers/net/can/c_can/Kconfig goes here #- file drivers/net/can/cc770/Kconfig goes here +#- file drivers/net/can/ctucanfd/Kconfig goes here #- file drivers/net/can/ifi_canfd/Kconfig goes here #- file drivers/net/can/m_can/Kconfig goes here #- file drivers/net/can/mscan/Kconfig goes here @@ -6361,6 +6393,11 @@ CAN_CC770 all=m CAN_CC770_ISA all=m CAN_CC770_PLATFORM all=m +#- +#- *** FILE: drivers/net/can/ctucanfd/Kconfig *** +#- +CAN_CTUCANFD_PCI all=m + #- #- *** FILE: drivers/net/can/ifi_canfd/Kconfig *** #- @@ -6548,7 +6585,7 @@ WD80x3 alpha=m i386=m #- #- *** FILE: drivers/net/ethernet/Kconfig *** #- -ETHERNET arm=y arm64=y +ETHERNET all=y #- file drivers/net/ethernet/3com/Kconfig goes here #- file drivers/net/ethernet/actions/Kconfig goes here #- file drivers/net/ethernet/adaptec/Kconfig goes here @@ -6634,6 +6671,7 @@ ETHOC all=m #- file drivers/net/ethernet/socionext/Kconfig goes here #- file drivers/net/ethernet/stmicro/Kconfig goes here #- file drivers/net/ethernet/sun/Kconfig goes here +#- file drivers/net/ethernet/sunplus/Kconfig goes here #- file drivers/net/ethernet/synopsys/Kconfig goes here #- file drivers/net/ethernet/tehuti/Kconfig goes here #- file drivers/net/ethernet/ti/Kconfig goes here @@ -6689,7 +6727,6 @@ AMD8111_ETH all=m LANCE alpha=m i386=m PCNET32 all=m PCMCIA_NMCLAN all=m -NI65 alpha=m i386=m SUNLANCE sparc=m sparc64=m AMD_XGBE all=m AMD_XGBE_DCB all=y @@ -6738,7 +6775,7 @@ ALX all=m #- #- *** FILE: drivers/net/ethernet/broadcom/Kconfig *** #- -NET_VENDOR_BROADCOM arm=y arm64=y +NET_VENDOR_BROADCOM all=y B44 all=m BCMGENET all=m BNX2 all=m @@ -6793,7 +6830,7 @@ LIQUIDIO_VF all=m #- #- *** FILE: drivers/net/ethernet/chelsio/Kconfig *** #- -NET_VENDOR_CHELSIO arm=y arm64=y +NET_VENDOR_CHELSIO all=y CHELSIO_T1 all=m sparc=n CHELSIO_T1_1G all=y CHELSIO_T3 all=m @@ -6861,7 +6898,6 @@ TULIP_MWI all=n TULIP_MMIO all=n TULIP_NAPI all=y TULIP_NAPI_HW_MITIGATION all=y -DE4X5 all=m WINBOND_840 all=m DM9102 all=m ULI526X all=m @@ -7037,8 +7073,14 @@ SKGE_GENESIS all=y SKY2 all=m sparc=n SKY2_DEBUG all=n #- file drivers/net/ethernet/marvell/octeontx2/Kconfig goes here +#- file drivers/net/ethernet/marvell/octeon_ep/Kconfig goes here #- file drivers/net/ethernet/marvell/prestera/Kconfig goes here +#- +#- *** FILE: drivers/net/ethernet/marvell/octeon_ep/Kconfig *** +#- +OCTEON_EP all=m + #- #- *** FILE: drivers/net/ethernet/marvell/octeontx2/Kconfig *** #- @@ -7056,7 +7098,7 @@ PRESTERA_PCI all=m #- #- *** FILE: drivers/net/ethernet/mellanox/Kconfig *** #- -NET_VENDOR_MELLANOX arm=y arm64=y +NET_VENDOR_MELLANOX all=y #- file drivers/net/ethernet/mellanox/mlx4/Kconfig goes here #- file drivers/net/ethernet/mellanox/mlx5/core/Kconfig goes here #- file drivers/net/ethernet/mellanox/mlxsw/Kconfig goes here @@ -7086,11 +7128,7 @@ MLX5_TC_CT all=y MLX5_TC_SAMPLE all=y MLX5_CORE_EN_DCB all=y MLX5_CORE_IPOIB all=y -MLX5_FPGA_IPSEC all=y -MLX5_IPSEC all=y MLX5_EN_IPSEC all=y -MLX5_FPGA_TLS all=y -MLX5_TLS all=y MLX5_EN_TLS all=y MLX5_SW_STEERING all=y MLX5_SF all=y @@ -7306,6 +7344,7 @@ SFC_MCDI_MON all=y SFC_SRIOV all=y SFC_MCDI_LOGGING all=y #- file drivers/net/ethernet/sfc/falcon/Kconfig goes here +#- file drivers/net/ethernet/sfc/siena/Kconfig goes here #- #- *** FILE: drivers/net/ethernet/sfc/falcon/Kconfig *** @@ -7313,6 +7352,15 @@ SFC_MCDI_LOGGING all=y SFC_FALCON all=m SFC_FALCON_MTD all=y +#- +#- *** FILE: drivers/net/ethernet/sfc/siena/Kconfig *** +#- +SFC_SIENA all=m +SFC_SIENA_MTD all=y +SFC_SIENA_MCDI_MON all=y +SFC_SIENA_SRIOV all=y +SFC_SIENA_MCDI_LOGGING all=y + #- #- *** FILE: drivers/net/ethernet/silan/Kconfig *** #- @@ -7455,7 +7503,6 @@ SKFP all=m MKISS all=m 6PACK all=m BPQETHER all=m -DMASCC i386=m SCC alpha=m i386=m SCC_DELAY alpha=n i386=n SCC_TRXECHO alpha=y i386=y @@ -7483,7 +7530,6 @@ HYPERV_NET all=m IEEE802154_DRIVERS all=m IEEE802154_FAKELB all=m IEEE802154_AT86RF230 all=m -IEEE802154_AT86RF230_DEBUGFS all=n IEEE802154_MRF24J40 all=m IEEE802154_CC2520 all=m IEEE802154_ATUSB all=m @@ -7536,6 +7582,7 @@ SFP all=m AMD_PHY all=m MESON_GXL_PHY arm64=m ADIN_PHY all=m +ADIN1100_PHY all=m AQUANTIA_PHY all=m AX88796B_PHY all=m BROADCOM_PHY all=m @@ -7577,6 +7624,7 @@ DP83TC811_PHY all=m DP83848_PHY all=m DP83867_PHY all=m DP83869_PHY all=m +DP83TD510_PHY all=m VITESSE_PHY all=m XILINX_GMII2RGMII all=m MICREL_KS8995MA all=m @@ -7674,10 +7722,6 @@ USB_RTL8153_ECM all=m #- *** FILE: drivers/net/wan/Kconfig *** #- WAN all=y -HOSTESS_SV11 alpha=m i386=m -COSA alpha=m i386=m -LANMEDIA all=m -SEALEVEL_4021 alpha=m i386=m HDLC all=m HDLC_RAW all=m HDLC_RAW_ETH all=m @@ -7708,9 +7752,11 @@ WLAN all=y #- file drivers/net/wireless/marvell/Kconfig goes here #- file drivers/net/wireless/mediatek/Kconfig goes here #- file drivers/net/wireless/microchip/Kconfig goes here +#- file drivers/net/wireless/purelifi/Kconfig goes here #- file drivers/net/wireless/ralink/Kconfig goes here #- file drivers/net/wireless/realtek/Kconfig goes here #- file drivers/net/wireless/rsi/Kconfig goes here +#- file drivers/net/wireless/silabs/Kconfig goes here #- file drivers/net/wireless/st/Kconfig goes here #- file drivers/net/wireless/ti/Kconfig goes here #- file drivers/net/wireless/zydas/Kconfig goes here @@ -7775,7 +7821,7 @@ ATH11K_TRACING all=n ATH5K all=m ATH5K_DEBUG all=n ATH5K_TRACER all=n -ATH5K_PCI arm=y arm64=y +ATH5K_PCI all=y #- #- *** FILE: drivers/net/wireless/ath/ath6kl/Kconfig *** @@ -8068,6 +8114,17 @@ WILC1000_SDIO all=m WILC1000_SPI all=n WILC1000_HW_OOB_INTR all=y +#- +#- *** FILE: drivers/net/wireless/purelifi/Kconfig *** +#- +WLAN_VENDOR_PURELIFI all=y +#- file drivers/net/wireless/purelifi/plfxlc/Kconfig goes here + +#- +#- *** FILE: drivers/net/wireless/purelifi/plfxlc/Kconfig *** +#- +PLFXLC all=m + #- #- *** FILE: drivers/net/wireless/quantenna/Kconfig *** #- @@ -8163,6 +8220,7 @@ RTW88_DEBUGFS all=n #- RTW89 all=m RTW89_8852AE all=m +RTW89_8852CE all=m RTW89_DEBUGMSG all=y RTW89_DEBUGFS all=y @@ -8176,6 +8234,17 @@ RSI_SDIO all=m RSI_USB all=m RSI_COEX all=y +#- +#- *** FILE: drivers/net/wireless/silabs/Kconfig *** +#- +WLAN_VENDOR_SILABS all=y +#- file drivers/net/wireless/silabs/wfx/Kconfig goes here + +#- +#- *** FILE: drivers/net/wireless/silabs/wfx/Kconfig *** +#- +WFX all=m + #- #- *** FILE: drivers/net/wireless/st/Kconfig *** #- @@ -8219,7 +8288,7 @@ WL18XX all=m #- #- *** FILE: drivers/net/wireless/ti/wlcore/Kconfig *** #- -WLCORE arm=m arm64=m +WLCORE all=m WLCORE_SPI all=m WLCORE_SDIO all=m @@ -8245,6 +8314,7 @@ MHI_WWAN_CTRL all=m MHI_WWAN_MBIM all=m RPMSG_WWAN_CTRL=m IOSM=m +MTK_T7XX all=m #- #- *** FILE: drivers/nfc/Kconfig *** @@ -8841,6 +8911,7 @@ PINCTRL_MESON_S4 arm64=m #- *** FILE: drivers/platform/chrome/Kconfig *** #- CHROME_PLATFORMS all=y +CHROMEOS_ACPI all=m CHROMEOS_LAPTOP all=m CHROMEOS_PSTORE all=m CHROMEOS_TBMC all=m @@ -8887,6 +8958,7 @@ MLXREG_LC all=m MLXBF_TMFIFO arm64=m MLXBF_BOOTCTL arm64=m MLXBF_PMC arm64=m +NVSW_SN2201 all=m #- #- *** FILE: drivers/platform/surface/Kconfig *** @@ -8988,6 +9060,7 @@ INTEL_SCU_PCI all=y INTEL_SCU_PLATFORM all=m INTEL_SCU_IPC_UTIL all=m SIEMENS_SIMATIC_IPC all=m +WINMATE_FM07_KEYS all=m #- #- *** FILE: drivers/platform/x86/dell/Kconfig *** @@ -9012,6 +9085,7 @@ DELL_WMI_SYSMAN all=m #- *** FILE: drivers/platform/x86/intel/Kconfig *** #- #- file drivers/platform/x86/intel/atomisp2/Kconfig goes here +#- file drivers/platform/x86/intel/ifs/Kconfig goes here #- file drivers/platform/x86/intel/int1092/Kconfig goes here #- file drivers/platform/x86/intel/int3472/Kconfig goes here #- file drivers/platform/x86/intel/pmc/Kconfig goes here @@ -9401,6 +9475,7 @@ REGULATOR_RT4801 all=m REGULATOR_RT4831=m REGULATOR_RT5033 all=m REGULATOR_RT5190A all=m +REGULATOR_RT5759 all=m REGULATOR_RT6160=m REGULATOR_RT6245=m REGULATOR_RTQ2134 all=m @@ -9666,7 +9741,6 @@ SCSI_ARCMSR all=m sparc=n #- file drivers/scsi/mpt3sas/Kconfig goes here #- file drivers/scsi/mpi3mr/Kconfig goes here #- file drivers/scsi/smartpqi/Kconfig goes here -#- file drivers/scsi/ufs/Kconfig goes here SCSI_HPTIOP all=m sparc=n SCSI_BUSLOGIC all=m SCSI_FLASHPOINT all=y @@ -9893,20 +9967,6 @@ SCSI_QLA_ISCSI all=m sparc=n #- SCSI_SMARTPQI all=m -#- -#- *** FILE: drivers/scsi/ufs/Kconfig *** -#- -SCSI_UFSHCD all=m -SCSI_UFSHCD_PCI all=m -SCSI_UFS_DWC_TC_PCI all=m -SCSI_UFSHCD_PLATFORM all=m -SCSI_UFS_CDNS_PLATFORM all=m -SCSI_UFS_DWC_TC_PLATFORM all=m -SCSI_UFS_BSG all=y -SCSI_UFS_CRYPTO all=y -SCSI_UFS_HPB all=y -SCSI_UFS_HWMON all=y - #- #- *** FILE: drivers/siox/Kconfig *** #- @@ -10089,7 +10149,6 @@ STAGING all=y #- file drivers/staging/board/Kconfig goes here #- file drivers/staging/gdm724x/Kconfig goes here #- file drivers/staging/fwserial/Kconfig goes here -#- file drivers/staging/unisys/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 @@ -10100,7 +10159,7 @@ STAGING all=y #- file drivers/staging/axis-fifo/Kconfig goes here #- file drivers/staging/fieldbus/Kconfig goes here #- file drivers/staging/qlge/Kconfig goes here -#- file drivers/staging/wfx/Kconfig goes here +#- file drivers/staging/vme_user/Kconfig goes here #- #- *** FILE: drivers/staging/axis-fifo/Kconfig *** @@ -10418,29 +10477,6 @@ RTS5208 all=m #- FB_SM750 all=m -#- -#- *** FILE: drivers/staging/unisys/Kconfig *** -#- -UNISYSSPAR all=y -#- file drivers/staging/unisys/visornic/Kconfig goes here -#- file drivers/staging/unisys/visorinput/Kconfig goes here -#- file drivers/staging/unisys/visorhba/Kconfig goes here - -#- -#- *** FILE: drivers/staging/unisys/visorhba/Kconfig *** -#- -UNISYS_VISORHBA all=m - -#- -#- *** FILE: drivers/staging/unisys/visorinput/Kconfig *** -#- -UNISYS_VISORINPUT all=m - -#- -#- *** FILE: drivers/staging/unisys/visornic/Kconfig *** -#- -UNISYS_VISORNIC all=m - #- #- *** FILE: drivers/staging/vc04_services/Kconfig *** #- @@ -10467,7 +10503,7 @@ VIDEO_BCM2835 arm=m BCM2835_VCHIQ_MMAL arm=m #- -#- *** FILE: drivers/staging/vme/devices/Kconfig *** +#- *** FILE: drivers/staging/vme_user/Kconfig *** #- #- VME Device Drivers VME_USER all=m @@ -10482,11 +10518,6 @@ VT6655 all=m #- VT6656 all=m -#- -#- *** FILE: drivers/staging/wfx/Kconfig *** -#- -WFX all=m - #- #- *** FILE: drivers/staging/wlan-ng/Kconfig *** #- @@ -10763,6 +10794,30 @@ SERIAL_MVEBU_CONSOLE all=y SERIAL_LITEUART arm=m arm64=m SERIAL_LITEUART_MAX_PORTS arm=1 arm64=1 +#- +#- *** FILE: drivers/ufs/Kconfig *** +#- +SCSI_UFSHCD all=m +#- file drivers/ufs/core/Kconfig goes here +#- file drivers/ufs/host/Kconfig goes here + +#- +#- *** FILE: drivers/ufs/core/Kconfig *** +#- +SCSI_UFS_BSG all=y +SCSI_UFS_CRYPTO all=y +SCSI_UFS_HPB all=y +SCSI_UFS_HWMON all=y + +#- +#- *** FILE: drivers/ufs/host/Kconfig *** +#- +SCSI_UFSHCD_PCI all=m +SCSI_UFS_DWC_TC_PCI all=m +SCSI_UFSHCD_PLATFORM all=m +SCSI_UFS_CDNS_PLATFORM all=m +SCSI_UFS_DWC_TC_PLATFORM all=m + #- #- *** FILE: drivers/uio/Kconfig *** #- @@ -11243,6 +11298,7 @@ TYPEC_NVIDIA_ALTMODE all=m #- #- *** FILE: drivers/usb/typec/mux/Kconfig *** #- +TYPEC_MUX_FSA4480 all=m TYPEC_MUX_PI3USB30532 all=m TYPEC_MUX_INTEL_PMC all=m @@ -11583,12 +11639,24 @@ VMGENID all=y #- file drivers/virt/vboxguest/Kconfig goes here #- file drivers/virt/nitro_enclaves/Kconfig goes here #- file drivers/virt/acrn/Kconfig goes here +#- file drivers/virt/coco/efi_secret/Kconfig goes here +#- file drivers/virt/coco/sev-guest/Kconfig goes here #- #- *** FILE: drivers/virt/acrn/Kconfig *** #- ACRN_HSM all=m +#- +#- *** FILE: drivers/virt/coco/efi_secret/Kconfig *** +#- +EFI_SECRET all=m + +#- +#- *** FILE: drivers/virt/coco/sev-guest/Kconfig *** +#- +SEV_GUEST all=m + #- #- *** FILE: drivers/virt/nitro_enclaves/Kconfig *** #- @@ -11604,6 +11672,7 @@ VBOXGUEST all=m #- VIRTIO all=y VIRTIO_MENU all=y +VIRTIO_HARDEN_NOTIFICATION all=n VIRTIO_PCI all=m VIRTIO_PCI_LEGACY all=y VIRTIO_VDPA all=m @@ -11614,18 +11683,12 @@ VIRTIO_INPUT all=m VIRTIO_MMIO all=m VIRTIO_MMIO_CMDLINE_DEVICES all=y -#- -#- *** FILE: drivers/visorbus/Kconfig *** -#- -UNISYS_VISORBUS all=m - #- #- *** FILE: drivers/vme/Kconfig *** #- VME_BUS all=y #- file drivers/vme/bridges/Kconfig goes here #- file drivers/vme/boards/Kconfig goes here -#- file drivers/staging/vme/devices/Kconfig goes here #- #- *** FILE: drivers/vme/boards/Kconfig *** @@ -11819,6 +11882,7 @@ XEN_ACPI_PROCESSOR all=m XEN_MCE_LOG all=y XEN_SYMS all=y XEN_UNPOPULATED_ALLOC all=y +XEN_VIRTIO all=y #- #- *** FILE: fs/9p/Kconfig *** @@ -11872,7 +11936,7 @@ TMPFS_POSIX_ACL all=y TMPFS_XATTR all=y TMPFS_INODE64 all=y HUGETLBFS all=y alpha= sparc= sparc64=y -HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON=y +HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON all=n #- file fs/configfs/Kconfig goes here #- file fs/efivarfs/Kconfig goes here MISC_FILESYSTEMS all=y @@ -11991,6 +12055,7 @@ BTRFS_FS_REF_VERIFY all=n CACHEFILES all=m CACHEFILES_DEBUG all=n CACHEFILES_ERROR_INJECTION all=n +CACHEFILES_ONDEMAND all=y #- #- *** FILE: fs/ceph/Kconfig *** @@ -12071,6 +12136,7 @@ EROFS_FS_POSIX_ACL all=y EROFS_FS_SECURITY all=y EROFS_FS_ZIP all=y EROFS_FS_ZIP_LZMA all=y +EROFS_FS_ONDEMAND all=y #- #- *** FILE: fs/exfat/Kconfig *** @@ -12562,7 +12628,6 @@ KERNEL_LZ4 all=n KERNEL_ZSTD all=n DEFAULT_INIT all="" DEFAULT_HOSTNAME all="(none)" -SWAP all=y SYSVIPC all=y SYSVIPC_SYSCTL all=y POSIX_MQUEUE all=y @@ -12637,6 +12702,8 @@ RELAY all=y BLK_DEV_INITRD all=y #- file usr/Kconfig goes here BOOT_CONFIG all=y +BOOT_CONFIG_EMBED all=n +INITRAMFS_PRESERVE_MTIME all=y CC_OPTIMIZE_FOR_PERFORMANCE all=y CC_OPTIMIZE_FOR_SIZE all=n SYSCTL all=y @@ -12659,21 +12726,10 @@ KALLSYMS all=y KALLSYMS_ALL all=y KALLSYMS_ABSOLUTE_PERCPU all=y KALLSYMS_BASE_RELATIVE all=y -USERFAULTFD all=y EMBEDDED all=n PC104 all=y PERF_EVENTS all=y DEBUG_PERF_USE_VMALLOC all=n -VM_EVENT_COUNTERS all=y -COMPAT_BRK all=n -SLAB all=n -SLUB all=y -SLOB all=n -SLAB_MERGE_DEFAULT all=y -SLAB_FREELIST_RANDOM all=y -SLAB_FREELIST_HARDENED all=y -SHUFFLE_PAGE_ALLOCATOR all=y -SLUB_CPU_PARTIAL all=y PROFILING all=y #- file arch/Kconfig goes here RT_MUTEXES all=y @@ -12682,6 +12738,7 @@ MODULES all=y MODULE_FORCE_LOAD all=y MODULE_UNLOAD all=y MODULE_FORCE_UNLOAD all=y +MODULE_UNLOAD_TAINT_TRACKING all=y MODVERSIONS all=y MODULE_SRCVERSION_ALL all=n MODULE_SIG all=y @@ -12813,6 +12870,7 @@ RCU_SCALE_TEST all=m RCU_TORTURE_TEST all=m RCU_REF_SCALE_TEST all=m RCU_CPU_STALL_TIMEOUT all=60 +RCU_EXP_CPU_STALL_TIMEOUT all=0 RCU_TRACE all=n RCU_EQS_DEBUG all=n @@ -12975,9 +13033,6 @@ DEBUG_FS_ALLOW_NONE all=n #- file net/Kconfig.debug goes here #- file mm/Kconfig.debug goes here DEBUG_OBJECTS all=n -DEBUG_SLAB all=n -SLUB_DEBUG_ON all=n -SLUB_STATS all=n DEBUG_KMEMLEAK all=n DEBUG_STACK_USAGE all=n SCHED_STACK_END_CHECK all=y @@ -13000,7 +13055,6 @@ SOFTLOCKUP_DETECTOR all=y BOOTPARAM_SOFTLOCKUP_PANIC all=n HARDLOCKUP_DETECTOR all=y BOOTPARAM_HARDLOCKUP_PANIC all=n -BOOTPARAM_HARDLOCKUP_PANIC_VALUE all=0 DETECT_HUNG_TASK all=y DEFAULT_HUNG_TASK_TIMEOUT all=120 BOOTPARAM_HUNG_TASK_PANIC all=n @@ -13199,6 +13253,32 @@ XZ_DEC_TEST all=m #- #- *** FILE: mm/Kconfig *** #- +SWAP all=y +ZSWAP all=y +ZSWAP_DEFAULT_ON all=y +ZSWAP_COMPRESSOR_DEFAULT_DEFLATE all=n +ZSWAP_COMPRESSOR_DEFAULT_LZO all=y +ZSWAP_COMPRESSOR_DEFAULT_842 all=n +ZSWAP_COMPRESSOR_DEFAULT_LZ4 all=n +ZSWAP_COMPRESSOR_DEFAULT_LZ4HC all=n +ZSWAP_COMPRESSOR_DEFAULT_ZSTD all=n +ZSWAP_ZPOOL_DEFAULT_ZBUD all=y +ZSWAP_ZPOOL_DEFAULT_Z3FOLD all=n +ZSWAP_ZPOOL_DEFAULT_ZSMALLOC all=n +ZBUD all=y +Z3FOLD all=m +ZSMALLOC all=y +ZSMALLOC_STAT all=y +SLAB all=n +SLUB all=y +SLOB all=n +SLAB_MERGE_DEFAULT all=y +SLAB_FREELIST_RANDOM all=y +SLAB_FREELIST_HARDENED all=y +SLUB_STATS all=n +SLUB_CPU_PARTIAL all=y +SHUFFLE_PAGE_ALLOCATOR all=y +COMPAT_BRK all=n FLATMEM_MANUAL all=n alpha=y arm=y arm64=n ppc=y sparc=y sparc64=n SPARSEMEM_MANUAL all=y alpha=n arm=n arm64=y ppc=n sparc=n sparc64=y SPARSEMEM_VMEMMAP all=y @@ -13208,6 +13288,7 @@ MEMORY_HOTREMOVE all=y SPLIT_PTLOCK_CPUS all=4 BALLOON_COMPACTION all=y COMPACTION all=y +PAGE_REPORTING all=y MIGRATION all=y BOUNCE all=y KSM all=y @@ -13217,6 +13298,7 @@ HWPOISON_INJECT all=m TRANSPARENT_HUGEPAGE all=y TRANSPARENT_HUGEPAGE_ALWAYS all=y TRANSPARENT_HUGEPAGE_MADVISE all=n +READ_ONLY_THP_FOR_FS all=n FRONTSWAP all=y CMA all=y CMA_DEBUG all=n @@ -13224,31 +13306,18 @@ CMA_DEBUGFS all=n CMA_SYSFS all=y CMA_AREAS all=7 MEM_SOFT_DIRTY all=y -ZSWAP all=y -ZSWAP_COMPRESSOR_DEFAULT_DEFLATE all=n -ZSWAP_COMPRESSOR_DEFAULT_LZO all=y -ZSWAP_COMPRESSOR_DEFAULT_842 all=n -ZSWAP_COMPRESSOR_DEFAULT_LZ4 all=n -ZSWAP_COMPRESSOR_DEFAULT_LZ4HC all=n -ZSWAP_COMPRESSOR_DEFAULT_ZSTD all=n -ZSWAP_ZPOOL_DEFAULT_ZBUD all=y -ZSWAP_ZPOOL_DEFAULT_Z3FOLD all=n -ZSWAP_ZPOOL_DEFAULT_ZSMALLOC all=n -ZSWAP_DEFAULT_ON all=y -ZBUD all=y -Z3FOLD all=m -ZSMALLOC all=y -ZSMALLOC_STAT all=y DEFERRED_STRUCT_PAGE_INIT all=n IDLE_PAGE_TRACKING all=y arm=n ZONE_DEVICE all=y HMM_MIRROR all=y DEVICE_PRIVATE all=y +VM_EVENT_COUNTERS all=y PERCPU_STATS all=n GUP_TEST all=n #- GUP_TEST needs to have DEBUG_FS enabled -READ_ONLY_THP_FOR_FS all=n ANON_VMA_NAME all=n +USERFAULTFD all=y +PTE_MARKER_UFFD_WP all=y #- file mm/damon/Kconfig goes here #- @@ -13256,6 +13325,8 @@ ANON_VMA_NAME all=n #- PAGE_EXTENSION all=n i386=y DEBUG_PAGEALLOC all=n +DEBUG_SLAB all=n +SLUB_DEBUG_ON all=n PAGE_OWNER all=n PAGE_TABLE_CHECK all=n PAGE_POISONING all=n @@ -13407,6 +13478,7 @@ ETHTOOL_NETLINK all=y #- NET_DEV_REFCNT_TRACKER all=n NET_NS_REFCNT_TRACKER all=n +DEBUG_NET all=n #- #- *** FILE: net/atm/Kconfig *** @@ -14391,8 +14463,6 @@ SAMPLES all=n #- GCC_PLUGINS all=y GCC_PLUGIN_LATENT_ENTROPY all=n -GCC_PLUGIN_RANDSTRUCT all=y -GCC_PLUGIN_RANDSTRUCT_PERFORMANCE all=y #- #- *** FILE: security/Kconfig *** @@ -14400,6 +14470,7 @@ GCC_PLUGIN_RANDSTRUCT_PERFORMANCE all=y #- file security/keys/Kconfig goes here SECURITY_DMESG_RESTRICT all=y SECURITY all=y +SECURITYFS all=y SECURITY_NETWORK all=y SECURITY_INFINIBAND all=y SECURITY_NETWORK_XFRM all=y @@ -14443,6 +14514,10 @@ STACKLEAK_RUNTIME_DISABLE all=y INIT_ON_ALLOC_DEFAULT_ON all=y INIT_ON_FREE_DEFAULT_ON all=n ZERO_CALL_USED_REGS all=y +RANDSTRUCT_NONE all=n +RANDSTRUCT_FULL all=n +RANDSTRUCT_PERFORMANCE all=y +GCC_PLUGIN_RANDSTRUCT all=y #- #- *** FILE: security/apparmor/Kconfig *** @@ -14489,11 +14564,19 @@ KEYS_REQUEST_CACHE all=y PERSISTENT_KEYRINGS all=y BIG_KEYS all=y TRUSTED_KEYS all=m +#- file security/keys/trusted-keys/Kconfig goes here ENCRYPTED_KEYS all=y USER_DECRYPTED_DATA all=y KEY_DH_OPERATIONS all=y KEY_NOTIFICATIONS all=y +#- +#- *** FILE: security/keys/trusted-keys/Kconfig *** +#- +TRUSTED_KEYS_TPM all=y +TRUSTED_KEYS_TEE all=y +#- No trust source selected! + #- #- *** FILE: security/landlock/Kconfig *** #- @@ -14954,9 +15037,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 *** @@ -14992,8 +15072,10 @@ SND_SOC_CS35L33 all=m SND_SOC_CS35L34 all=m SND_SOC_CS35L35 all=m SND_SOC_CS35L36 all=m -SND_SOC_CS35L41_SPI arm=m arm64=m +SND_SOC_CS35L41_SPI all=m SND_SOC_CS35L41_I2C all=m +SND_SOC_CS35L45_SPI all=m +SND_SOC_CS35L45_I2C all=m SND_SOC_CS42L42 all=m SND_SOC_CS42L51 all=m SND_SOC_CS42L51_I2C all=m @@ -15011,12 +15093,12 @@ SND_SOC_CS43130 all=m SND_SOC_CS4341 all=m SND_SOC_CS4349 all=m SND_SOC_CS53L30 all=m -SND_SOC_CX2072X arm=m arm64=m -SND_SOC_DA7213 arm=m arm64=m -SND_SOC_DMIC arm=m arm64=m +SND_SOC_CX2072X all=m +SND_SOC_DA7213 all=m +SND_SOC_DMIC all=m SND_SOC_ES7134 all=m SND_SOC_ES7241 all=m -SND_SOC_ES8316 arm=m arm64=m +SND_SOC_ES8316 all=m SND_SOC_ES8328 all=m SND_SOC_ES8328_I2C all=m SND_SOC_ES8328_SPI all=m @@ -15026,15 +15108,16 @@ SND_SOC_ICS43432 all=m SND_SOC_INNO_RK3036 all=m SND_SOC_MAX98088 all=m SND_SOC_MAX98095 all=m -SND_SOC_MAX98357A arm=m arm64=m +SND_SOC_MAX98357A all=m SND_SOC_MAX98504 all=m SND_SOC_MAX9867 all=m SND_SOC_MAX98927 all=m SND_SOC_MAX98520 all=m SND_SOC_MAX98373 all=m -SND_SOC_MAX98373_I2C arm=m arm64=m +SND_SOC_MAX98373_I2C all=m SND_SOC_MAX98373_SDW all=m SND_SOC_MAX98390 all=m +SND_SOC_MAX98396 all=m SND_SOC_MAX9850 all=m SND_SOC_MAX9860 all=m SND_SOC_MSM8916_WCD_ANALOG all=m @@ -15056,10 +15139,10 @@ SND_SOC_PCM512x_SPI all=m SND_SOC_RK3328 all=m SND_SOC_RK817 arm=m arm64=m SND_SOC_RT1308_SDW all=m -SND_SOC_RT1316_SDW arm=m arm64=m +SND_SOC_RT1316_SDW all=m SND_SOC_RT5616 all=m SND_SOC_RT5631 all=m -SND_SOC_RT5640 arm=m arm64=m +SND_SOC_RT5640 all=m SND_SOC_RT5659 all=m SND_SOC_RT5670 all=m SND_SOC_RT5677 all=m @@ -15067,9 +15150,9 @@ SND_SOC_RT5677_SPI all=m SND_SOC_RT5682_SDW all=m SND_SOC_RT700_SDW all=m SND_SOC_RT711_SDW all=m -SND_SOC_RT711_SDCA_SDW arm=m arm64=m +SND_SOC_RT711_SDCA_SDW all=m SND_SOC_RT715_SDW all=m -SND_SOC_RT715_SDCA_SDW arm=m arm64=m +SND_SOC_RT715_SDCA_SDW all=m SND_SOC_RT9120 all=m SND_SOC_SGTL5000 all=m SND_SOC_SIMPLE_AMPLIFIER all=m @@ -15121,6 +15204,8 @@ SND_SOC_WM8580 all=m SND_SOC_WM8711 all=m SND_SOC_WM8728 all=m SND_SOC_WM8731 all=m +SND_SOC_WM8731_I2C all=m +SND_SOC_WM8731_SPI all=m SND_SOC_WM8737 all=m SND_SOC_WM8741 all=m SND_SOC_WM8750 all=m @@ -15133,6 +15218,7 @@ SND_SOC_WM8804_I2C all=m SND_SOC_WM8804_SPI all=m SND_SOC_WM8903 all=m SND_SOC_WM8904 all=m +SND_SOC_WM8940 all=m SND_SOC_WM8960 all=m SND_SOC_WM8962 all=m SND_SOC_WM8974 all=m @@ -15149,7 +15235,7 @@ SND_SOC_MT6660 all=m SND_SOC_NAU8315 all=m SND_SOC_NAU8540 all=m SND_SOC_NAU8810 all=m -SND_SOC_NAU8821 arm=m arm64=m +SND_SOC_NAU8821 all=m SND_SOC_NAU8822 all=m SND_SOC_NAU8824 all=m SND_SOC_TPA6130A2 all=m @@ -15602,6 +15688,9 @@ SATA_DWC_DEBUG all=n SBNI i386=m x86_64=m SBNI_MULTILINE i386=y x86_64=y SENSORS_AMD_ENERGY 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 SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 all=y SND_SOC_ZX_AUD96P22 all=m SPI_INTEL_SPI_PCI all=m diff --git a/kernel-x86.config b/kernel-x86.config index 7fd7449d..1972e1ca 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -29,6 +29,7 @@ PARAVIRT_SPINLOCKS x86=n KVM_GUEST x86=y PVH x86=y PARAVIRT_TIME_ACCOUNTING x86=y +INTEL_TDX_GUEST x86_64=y #- file arch/x86/Kconfig.cpu goes here HPET_TIMER x86=y DMI x86=y @@ -55,6 +56,7 @@ X86_REBOOTFIXUPS i386=y MICROCODE all=y MICROCODE_INTEL x86=y MICROCODE_AMD x86=y +MICROCODE_LATE_LOADING x86=n X86_MSR x86=m X86_CPUID x86=m NOHIGHMEM i386=n @@ -98,17 +100,16 @@ HOTPLUG_CPU x86=y BOOTPARAM_HOTPLUG_CPU0 all=n DEBUG_HOTPLUG_CPU0 all=n COMPAT_VDSO x86=n -LEGACY_VSYSCALL_EMULATE all=n LEGACY_VSYSCALL_XONLY all=y LEGACY_VSYSCALL_NONE all=n CMDLINE_BOOL x86=n #- file kernel/livepatch/Kconfig goes here SPECULATION_MITIGATIONS x86=y RETPOLINE x86=y -RETHUNK x86=y -CPU_UNRET_ENTRY x86=y -CPU_IBPB_ENTRY x86=y -CPU_IBRS_ENTRY x86=y +RETHUNK x86_64=y +CPU_UNRET_ENTRY x86_64=y +CPU_IBPB_ENTRY x86_64=y +CPU_IBRS_ENTRY x86_64=y SLS x86_64=y #- file kernel/power/Kconfig goes here #- file drivers/acpi/Kconfig goes here @@ -134,7 +135,6 @@ ALIX i486=y i586=y i686=y NET5501 i486=y i586=y i686=y GEOS i486=y i586=y i686=y IA32_EMULATION x86_64=y -IA32_AOUT x86_64=y #- file arch/x86/kvm/Kconfig goes here #- file arch/x86/Kconfig.assembler goes here @@ -174,6 +174,11 @@ CPU_SUP_INTEL x86=y CPU_SUP_AMD x86=y CPU_SUP_CENTAUR x86=y +#- +#- *** FILE: arch/x86/events/Kconfig *** +#- +PERF_EVENTS_AMD_BRS x86=y + #- #- *** FILE: arch/x86/kvm/Kconfig *** #- diff --git a/kernel.spec b/kernel.spec index 0eab377a..c1a7950d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,8 +66,8 @@ %endif %define rel 1 -%define basever 5.18 -%define postver .14 +%define basever 5.19 +%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/v5.x/linux-%{basever}.tar.xz -# Source0-md5: 58e80452e2d8e1993cd7ec95e697ab5a +# Source0-md5: f91bfe133d2cb1692f705947282e123a %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz # Patch0-md5: 05dee8a9a2d04a0cde691b449114177b @@ -726,7 +726,8 @@ find -name '*.pl' -print0 | \ %{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \ tools/testing/selftests/powerpc/security/mitigation-patching.sh \ - scripts/config + scripts/config \ + scripts/check-local-export %build install -d %{objdir} @@ -1455,6 +1456,7 @@ fi %{_kernelsrcdir}/scripts/kconfig/lxdialog %{_kernelsrcdir}/scripts/mod/*.c %{_kernelsrcdir}/scripts/mod/modpost.h +%attr(755,root,root) %{_kernelsrcdir}/scripts/check-local-export %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion %{_kernelsrcdir}/scripts/subarch.include @@ -1522,6 +1524,7 @@ fi %exclude %{_kernelsrcdir}/scripts/Kbuild.include %exclude %{_kernelsrcdir}/scripts/Makefile* %exclude %{_kernelsrcdir}/scripts/basic +%exclude %{_kernelsrcdir}/scripts/check-local-export %exclude %{_kernelsrcdir}/scripts/kconfig %exclude %{_kernelsrcdir}/scripts/mkcompile_h %exclude %{_kernelsrcdir}/scripts/mod -- 2.44.0