From 297db1321cc9de988691c31a8f6f97e5301cad46 Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Sun, 27 Dec 2020 16:48:38 +0300 Subject: [PATCH] Updated to v5.10.3 --- .abf.yml | 4 +- ...repare-scripts-configs-in-devel-rpms.patch | 59 ++++--- fs-aufs.patch | 158 +++++++++--------- kernel-x86_64.config | 129 +++++++++++--- kernel.spec | 4 +- ...heck.sh-set-the-exit-code-explicitly.patch | 11 +- 6 files changed, 226 insertions(+), 139 deletions(-) diff --git a/.abf.yml b/.abf.yml index 2440abe..c2ff625 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - linux-5.9.tar.xz: 0617d9e190869ec11f2a28791f2cbd34c250f51b - patch-5.9.14.xz: f77249c1190523667354a7b466686e161d7c169a + linux-5.10.tar.xz: be0b909f1fbb760cc2d5cf146e1da3b2af0cf899 + patch-5.10.3.xz: 7ddbbe8a49fb5ad8f2ed7aa70c4efbfdd4685bc1 diff --git a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch index 1caa220..62208ac 100644 --- a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch +++ b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 50e927f34853..e85bd4aea3cc 100644 +index 44f4cd2e58a8..d7f4a425acb0 100644 --- a/Makefile +++ b/Makefile -@@ -1178,8 +1178,7 @@ include/config/kernel.release: FORCE +@@ -1186,8 +1186,7 @@ include/config/kernel.release: FORCE # Carefully list dependencies so we do not try to build scripts twice # in parallel PHONY += scripts @@ -12,7 +12,7 @@ index 50e927f34853..e85bd4aea3cc 100644 # Things we need to do before we recursively start building the kernel # or the modules are listed in "prepare". -@@ -1198,7 +1197,7 @@ prepare0: archprepare +@@ -1206,7 +1205,7 @@ prepare0: archprepare $(Q)$(MAKE) $(build)=. # All the preparing.. @@ -21,8 +21,8 @@ index 50e927f34853..e85bd4aea3cc 100644 # Support for using generic headers in asm-generic asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj -@@ -1462,15 +1461,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \ - modules.builtin modules.builtin.modinfo modules.nsdeps +@@ -1472,15 +1471,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \ + compile_commands.json # Directories & files removed with 'make mrproper' -MRPROPER_FILES += include/config include/generated \ @@ -38,7 +38,7 @@ index 50e927f34853..e85bd4aea3cc 100644 # Directories & files removed with 'make distclean' DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS -@@ -1490,13 +1481,10 @@ clean: archclean vmlinuxclean +@@ -1500,13 +1491,10 @@ clean: archclean vmlinuxclean # mrproper - Delete all generated files, including .config # mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) @@ -55,51 +55,58 @@ index 50e927f34853..e85bd4aea3cc 100644 # distclean diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile -index 52b59bf9efe4..54cc6a62f229 100644 +index e46df0a2d4f9..901b707df8fe 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -20,19 +20,14 @@ endif unexport CONFIG_ xconfig: $(obj)/qconf -- $< $(silent) $(Kconfig) +- $(Q)$< $(silent) $(Kconfig) gconfig: $(obj)/gconf -- $< $(silent) $(Kconfig) +- $(Q)$< $(silent) $(Kconfig) menuconfig: $(obj)/mconf -- $< $(silent) $(Kconfig) +- $(Q)$< $(silent) $(Kconfig) config: $(obj)/conf -- $< $(silent) --oldaskconfig $(Kconfig) +- $(Q)$< $(silent) --oldaskconfig $(Kconfig) nconfig: $(obj)/nconf -- $< $(silent) $(Kconfig) +- $(Q)$< $(silent) $(Kconfig) build_menuconfig: $(obj)/mconf -@@ -48,11 +43,9 @@ localyesconfig localmodconfig: $(obj)/conf - cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ -- $< $(silent) --oldconfig $(Kconfig); \ - mv -f .config.old.1 .config.old) \ - else \ - mv -f .tmp.config .config; \ -- $< $(silent) --oldconfig $(Kconfig); \ - fi - $(Q)rm -f .tmp.config +@@ -43,18 +38,6 @@ build_gconfig: $(obj)/gconf + build_xconfig: $(obj)/qconf -@@ -68,24 +61,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ + localyesconfig localmodconfig: $(obj)/conf +- $(Q)$(PERL) $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config +- $(Q)if [ -f .config ]; then \ +- cmp -s .tmp.config .config || \ +- (mv -f .config .config.old.1; \ +- mv -f .tmp.config .config; \ +- $< $(silent) --oldconfig $(Kconfig); \ +- mv -f .config.old.1 .config.old) \ +- else \ +- mv -f .tmp.config .config; \ +- $< $(silent) --oldconfig $(Kconfig); \ +- fi +- $(Q)rm -f .tmp.config + + # These targets map 1:1 to the commandline options of 'conf' + # +@@ -68,24 +51,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ PHONY += $(simple-targets) $(simple-targets): $(obj)/conf -- $< $(silent) --$@ $(Kconfig) +- $(Q)$< $(silent) --$@ $(Kconfig) PHONY += savedefconfig defconfig savedefconfig: $(obj)/conf -- $< $(silent) --$@=defconfig $(Kconfig) +- $(Q)$< $(silent) --$@=defconfig $(Kconfig) defconfig: $(obj)/conf -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) diff --git a/fs-aufs.patch b/fs-aufs.patch index d12fde1..74b303f 100644 --- a/fs-aufs.patch +++ b/fs-aufs.patch @@ -1931,10 +1931,10 @@ index 000000000000..d55cae285dff +Currently this approach is applied to address_space_operations for +regular files only. diff --git a/MAINTAINERS b/MAINTAINERS -index 867157311dc8..79e2ef54db88 100644 +index 281de213ef47..407ae5c24566 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3027,6 +3027,19 @@ F: include/linux/audit.h +@@ -3009,6 +3009,19 @@ F: include/linux/audit.h F: include/uapi/linux/audit.h F: kernel/audit* @@ -1955,10 +1955,10 @@ index 867157311dc8..79e2ef54db88 100644 M: Miguel Ojeda Sandonis S: Maintained diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index d3394191e168..1bd6045111b1 100644 +index a58084c2ed7c..7be7ca3f5454 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c -@@ -764,6 +764,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, +@@ -765,6 +765,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, return error; } @@ -1996,7 +1996,7 @@ index aa4c12282301..b29bad13b249 100644 endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile -index 1c7b0e3f6daa..98594d17a073 100644 +index 999d1a23f036..0cd76857ca76 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ @@ -38001,10 +38001,10 @@ index ea0485861d93..30dec552278d 100644 /** * d_ancestor - search for an ancestor diff --git a/fs/exec.c b/fs/exec.c -index 07910f5032e7..166ae241414f 100644 +index 547a2390baf5..18d51d0face6 100644 --- a/fs/exec.c +++ b/fs/exec.c -@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path) +@@ -113,6 +113,7 @@ bool path_noexec(const struct path *path) return (path->mnt->mnt_flags & MNT_NOEXEC) || (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); } @@ -38043,7 +38043,7 @@ index 19ac5baad50f..b18afdf81e76 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 656647f9575a..6e11f3dc333f 100644 +index 709ada3151da..27a3e3c9f2a8 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -162,6 +162,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) @@ -38063,10 +38063,10 @@ index 656647f9575a..6e11f3dc333f 100644 void __init files_init(void) { diff --git a/fs/inode.c b/fs/inode.c -index 72c4c347afb7..749e33422187 100644 +index 9d78c37b00b8..9f23bc13f59f 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -894,6 +894,8 @@ unsigned int get_next_ino(void) +@@ -896,6 +896,8 @@ unsigned int get_next_ino(void) unsigned int *p = &get_cpu_var(last_ino); unsigned int res = *p; @@ -38075,7 +38075,7 @@ index 72c4c347afb7..749e33422187 100644 #ifdef CONFIG_SMP if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { static atomic_t shared_last_ino; -@@ -906,7 +908,7 @@ unsigned int get_next_ino(void) +@@ -908,7 +910,7 @@ unsigned int get_next_ino(void) res++; /* get_next_ino should not provide a 0 inode number */ if (unlikely(!res)) @@ -38084,7 +38084,7 @@ index 72c4c347afb7..749e33422187 100644 *p = res; put_cpu_var(last_ino); return res; -@@ -1768,12 +1770,13 @@ EXPORT_SYMBOL(generic_update_time); +@@ -1770,12 +1772,13 @@ EXPORT_SYMBOL(generic_update_time); * This does the actual work of updating an inodes time or version. Must have * had called mnt_want_write() before calling this. */ @@ -38100,7 +38100,7 @@ index 72c4c347afb7..749e33422187 100644 /** * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index bae0e95b3713..037c6e37edc9 100644 +index cebaa3e81794..38078cbede43 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -38158,10 +38158,10 @@ index 9af548fb841b..2ff09b709f7b 100644 long vfs_truncate(const struct path *path, loff_t length) { diff --git a/fs/proc/base.c b/fs/proc/base.c -index aa69c35d904c..14b58991a20c 100644 +index b362523a9829..669448bb8a73 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2178,7 +2178,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) +@@ -2184,7 +2184,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) rc = -ENOENT; vma = find_exact_vma(mm, vm_start, vm_end); if (vma && vma->vm_file) { @@ -38187,7 +38187,7 @@ index 13452b32e2bd..38acccfef9d4 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 5066b0251ed8..5225ed8f8375 100644 +index ee5a235b3056..80a46dcede7b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -280,7 +280,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -38202,7 +38202,7 @@ index 5066b0251ed8..5225ed8f8375 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1793,7 +1796,7 @@ static int show_numa_map(struct seq_file *m, void *v) +@@ -1855,7 +1858,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; @@ -38228,10 +38228,10 @@ index a6d21fc0033c..02c2de31196e 100644 ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; diff --git a/fs/read_write.c b/fs/read_write.c -index d3428189f36b..9344096050ad 100644 +index 75f764b43418..4ba9dca3af5b 100644 --- a/fs/read_write.c +++ b/fs/read_write.c -@@ -488,6 +488,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) +@@ -503,6 +503,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) inc_syscr(current); return ret; } @@ -38239,7 +38239,7 @@ index d3428189f36b..9344096050ad 100644 static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) { -@@ -507,6 +508,30 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t +@@ -522,6 +523,30 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t return ret; } @@ -38270,7 +38270,7 @@ index d3428189f36b..9344096050ad 100644 /* caller is responsible for file_start_write/file_end_write */ ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos) { -@@ -594,6 +619,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ +@@ -613,6 +638,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ file_end_write(file); return ret; } @@ -38279,10 +38279,10 @@ index d3428189f36b..9344096050ad 100644 /* file_ppos returns &file->f_pos or NULL if file is stream */ static inline loff_t *file_ppos(struct file *file) diff --git a/fs/splice.c b/fs/splice.c -index ce75aec52274..c8d8cf3b8cf7 100644 +index 866d5c2367b2..3e1787cae69a 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -859,8 +859,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -756,8 +756,8 @@ static int warn_unsupported(struct file *file, const char *op) /* * Attempt to initiate a splice from pipe to file. */ @@ -38291,9 +38291,9 @@ index ce75aec52274..c8d8cf3b8cf7 100644 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) { - if (out->f_op->splice_write) - return out->f_op->splice_write(pipe, out, ppos, len, flags); -@@ -870,9 +870,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + if (unlikely(!out->f_op->splice_write)) + return warn_unsupported(out, "write"); +@@ -767,9 +767,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, /* * Attempt to initiate a splice from a file to a pipe. */ @@ -38306,15 +38306,15 @@ index ce75aec52274..c8d8cf3b8cf7 100644 { int ret; -@@ -890,6 +890,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, - return in->f_op->splice_read(in, ppos, pipe, len, flags); - return default_file_splice_read(in, ppos, pipe, len, flags); +@@ -787,6 +787,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, + return warn_unsupported(in, "read"); + return in->f_op->splice_read(in, ppos, pipe, len, flags); } +EXPORT_SYMBOL_GPL(do_splice_from); /** * splice_direct_to_actor - splices data directly between two non-pipes -@@ -1036,6 +1037,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, +@@ -933,6 +934,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, return do_splice_from(pipe, file, sd->opos, sd->total_len, sd->flags); } @@ -38344,7 +38344,7 @@ index 1373a610dc78..fa5c7fba7f1b 100644 /* * Write out and wait upon all dirty data associated with this diff --git a/fs/xattr.c b/fs/xattr.c -index 386b45676d7e..abd3ec03afaf 100644 +index cd7a563e8bcd..7d989d57b0f0 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -360,6 +360,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value, @@ -38356,10 +38356,10 @@ index 386b45676d7e..abd3ec03afaf 100644 ssize_t __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, diff --git a/include/linux/fs.h b/include/linux/fs.h -index 7d4d04c9d3e6..663a13b071ca 100644 +index 8667d0cdc71e..097457929cdc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1337,6 +1337,7 @@ extern void fasync_free(struct fasync_struct *); +@@ -1332,6 +1332,7 @@ extern void fasync_free(struct fasync_struct *); /* can be called from interrupts */ extern void kill_fasync(struct fasync_struct **, int, int); @@ -38367,7 +38367,7 @@ index 7d4d04c9d3e6..663a13b071ca 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); -@@ -1822,6 +1823,7 @@ struct file_operations { +@@ -1843,6 +1844,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); @@ -38375,9 +38375,9 @@ index 7d4d04c9d3e6..663a13b071ca 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); -@@ -1892,6 +1894,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, - struct iovec *fast_pointer, - struct iovec **ret_pointer); +@@ -1908,6 +1910,12 @@ static inline int call_mmap(struct file *file, struct vm_area_struct *vma) + return file->f_op->mmap(file, vma); + } +typedef ssize_t (*vfs_readf_t)(struct file *, char __user *, size_t, loff_t *); +typedef ssize_t (*vfs_writef_t)(struct file *, const char __user *, size_t, @@ -38387,8 +38387,8 @@ index 7d4d04c9d3e6..663a13b071ca 100644 + extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); - extern ssize_t vfs_readv(struct file *, const struct iovec __user *, -@@ -2313,6 +2321,7 @@ extern int current_umask(void); + extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *, +@@ -2328,6 +2336,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); @@ -38396,7 +38396,7 @@ index 7d4d04c9d3e6..663a13b071ca 100644 /* /sys/fs */ extern struct kobject *fs_kobj; -@@ -2549,6 +2558,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) +@@ -2564,6 +2573,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) } void emergency_thaw_all(void); @@ -38405,10 +38405,10 @@ index 7d4d04c9d3e6..663a13b071ca 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 1130f271de66..d2ae377f2f19 100644 +index f5594879175a..93bb86198167 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h -@@ -237,6 +237,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, +@@ -241,6 +241,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, return lock->key == key; } @@ -38417,7 +38417,7 @@ index 1130f271de66..d2ae377f2f19 100644 /* * Acquire a lock. * -@@ -371,6 +373,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key) +@@ -375,6 +377,7 @@ static inline void lockdep_unregister_key(struct lock_class_key *key) #define lockdep_depth(tsk) (0) @@ -38426,10 +38426,10 @@ index 1130f271de66..d2ae377f2f19 100644 #define lockdep_assert_held(l) do { (void)(l); } while (0) diff --git a/include/linux/mm.h b/include/linux/mm.h -index 16b799a0522c..161dcccb25cf 100644 +index db6ae4d3fb4e..1a632192d9d9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1704,6 +1704,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1712,6 +1712,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -38459,7 +38459,7 @@ index 16b799a0522c..161dcccb25cf 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 ed028af3cb19..7b5590f94747 100644 +index 5a9238f6caad..ad387c3cb14f 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -280,6 +280,7 @@ struct vm_region { @@ -38499,7 +38499,7 @@ index 8f882f5881e8..6b9808f09843 100644 extern const struct file_operations proc_mountinfo_operations; extern const struct file_operations proc_mountstats_operations; diff --git a/include/linux/splice.h b/include/linux/splice.h -index 5c47013f708e..fef6c59ed92a 100644 +index a55179fd60fc..8e21c53cf883 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -93,4 +93,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); @@ -38972,7 +38972,7 @@ index 000000000000..34738b8cf349 + +#endif /* __AUFS_TYPE_H__ */ diff --git a/kernel/fork.c b/kernel/fork.c -index 8934886d1654..2e261f5e6676 100644 +index 6d266388d380..dd7f13c3bee7 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -554,7 +554,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -38982,13 +38982,13 @@ index 8934886d1654..2e261f5e6676 100644 - get_file(file); + vma_get_file(tmp); if (tmp->vm_flags & VM_DENYWRITE) - atomic_dec(&inode->i_writecount); + put_write_access(inode); i_mmap_lock_write(mapping); diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 85d15f0362dc..9bf241eb5624 100644 +index c1418b47f625..be002c3a3083 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -186,7 +186,7 @@ static +@@ -188,7 +188,7 @@ static struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); @@ -38997,7 +38997,7 @@ index 85d15f0362dc..9bf241eb5624 100644 { unsigned int class_idx = hlock->class_idx; -@@ -207,6 +207,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) +@@ -209,6 +209,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) */ return lock_classes + class_idx; } @@ -39007,16 +39007,16 @@ index 85d15f0362dc..9bf241eb5624 100644 #ifdef CONFIG_LOCK_STAT static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats); diff --git a/kernel/task_work.c b/kernel/task_work.c -index 613b2d634af8..1dd58908215d 100644 +index 8d6e1217c451..0e73637adda8 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c -@@ -144,3 +144,4 @@ void task_work_run(void) +@@ -154,3 +154,4 @@ void task_work_run(void) } while (work); } } +EXPORT_SYMBOL_GPL(task_work_run); diff --git a/mm/Makefile b/mm/Makefile -index d5649f1c12c0..d859cd529c09 100644 +index d73aed0fc99c..93076a66ad6a 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ @@ -39029,10 +39029,10 @@ index d5649f1c12c0..d859cd529c09 100644 # Give 'page_alloc' its own module-parameter namespace page-alloc-y := page_alloc.o diff --git a/mm/filemap.c b/mm/filemap.c -index 407b94d8ce00..999513ca2438 100644 +index 0b2067b3c328..3334207431c7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2871,7 +2871,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -2909,7 +2909,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) vm_fault_t ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); @@ -39042,7 +39042,7 @@ index 407b94d8ce00..999513ca2438 100644 if (page->mapping != inode->i_mapping) { unlock_page(page); diff --git a/mm/mmap.c b/mm/mmap.c -index 7a8987aa6996..4a8c2c1837a4 100644 +index 5c8b4485860d..59f2f758d77e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -39054,7 +39054,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 mpol_put(vma_policy(vma)); vm_area_free(vma); return next; -@@ -910,7 +910,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, +@@ -951,7 +951,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); @@ -39063,7 +39063,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 } if (next->anon_vma) anon_vma_merge(vma, next); -@@ -1856,8 +1856,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1897,8 +1897,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, return addr; unmap_and_free_vma: @@ -39073,7 +39073,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2719,7 +2719,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2757,7 +2757,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -39082,7 +39082,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2738,7 +2738,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2776,7 +2776,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) @@ -39091,7 +39091,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2931,7 +2931,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2969,7 +2969,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, struct vm_area_struct *vma; unsigned long populate = 0; unsigned long ret = -EINVAL; @@ -39100,7 +39100,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -3006,10 +3006,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -3044,10 +3044,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, } } @@ -39129,7 +39129,7 @@ index 7a8987aa6996..4a8c2c1837a4 100644 out: mmap_write_unlock(mm); if (populate) -@@ -3301,7 +3318,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3334,7 +3351,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) @@ -39139,10 +39139,10 @@ index 7a8987aa6996..4a8c2c1837a4 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 75a327149af1..479a091602c9 100644 +index 0faf39b32cdb..78ecad7204c8 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -540,7 +540,7 @@ static void __put_nommu_region(struct vm_region *region) +@@ -533,7 +533,7 @@ static void __put_nommu_region(struct vm_region *region) up_write(&nommu_region_sem); if (region->vm_file) @@ -39151,7 +39151,7 @@ index 75a327149af1..479a091602c9 100644 /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -672,7 +672,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -665,7 +665,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) @@ -39160,7 +39160,7 @@ index 75a327149af1..479a091602c9 100644 put_nommu_region(vma->vm_region); vm_area_free(vma); } -@@ -1195,7 +1195,7 @@ unsigned long do_mmap(struct file *file, +@@ -1188,7 +1188,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -39169,7 +39169,7 @@ index 75a327149af1..479a091602c9 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1272,10 +1272,10 @@ unsigned long do_mmap(struct file *file, +@@ -1265,10 +1265,10 @@ unsigned long do_mmap(struct file *file, up_write(&nommu_region_sem); error: if (region->vm_file) @@ -39275,10 +39275,10 @@ index 000000000000..00d51187c325 +} +#endif /* !CONFIG_MMU */ diff --git a/security/security.c b/security/security.c -index 70a7ad357bc6..d55b72977544 100644 +index a28045dc9e7f..310cf38efeec 100644 --- a/security/security.c +++ b/security/security.c -@@ -1092,6 +1092,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) +@@ -1093,6 +1093,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) return 0; return call_int_hook(path_rmdir, 0, dir, dentry); } @@ -39286,7 +39286,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_unlink(const struct path *dir, struct dentry *dentry) { -@@ -1108,6 +1109,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, +@@ -1109,6 +1110,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); } @@ -39294,7 +39294,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_link(struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry) -@@ -1116,6 +1118,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, +@@ -1117,6 +1119,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); } @@ -39302,7 +39302,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry, -@@ -1143,6 +1146,7 @@ int security_path_truncate(const struct path *path) +@@ -1144,6 +1147,7 @@ int security_path_truncate(const struct path *path) return 0; return call_int_hook(path_truncate, 0, path); } @@ -39310,7 +39310,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_chmod(const struct path *path, umode_t mode) { -@@ -1150,6 +1154,7 @@ int security_path_chmod(const struct path *path, umode_t mode) +@@ -1151,6 +1155,7 @@ int security_path_chmod(const struct path *path, umode_t mode) return 0; return call_int_hook(path_chmod, 0, path, mode); } @@ -39318,7 +39318,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) { -@@ -1157,6 +1162,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) +@@ -1158,6 +1163,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); } @@ -39326,7 +39326,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_path_chroot(const struct path *path) { -@@ -1257,6 +1263,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -1258,6 +1264,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return call_int_hook(inode_permission, 0, inode, mask); } @@ -39334,7 +39334,7 @@ index 70a7ad357bc6..d55b72977544 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -1449,6 +1456,7 @@ int security_file_permission(struct file *file, int mask) +@@ -1450,6 +1457,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ffe6db2..4c5e953 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -66,6 +66,7 @@ CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_DOCK=y +# CONFIG_ACPI_DPTF is not set # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EXTLOG=m CONFIG_ACPI_FAN=y @@ -197,6 +198,7 @@ CONFIG_ADVISE_SYSCALLS=y CONFIG_ADXL372_I2C=m CONFIG_ADXL372=m CONFIG_ADXL372_SPI=m +CONFIG_ADXRS290=m CONFIG_ADXRS450=m CONFIG_AFE4403=m CONFIG_AFE4404=m @@ -289,8 +291,12 @@ CONFIG_ARCNET=m CONFIG_ARCNET_RAW=m CONFIG_ARCNET_RIM_I=m CONFIG_AS3935=m +CONFIG_AS73211=m +CONFIG_AS_AVX512=y # CONFIG_ASHMEM is not set CONFIG_ASN1=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_NB_WMI=m @@ -328,6 +334,12 @@ CONFIG_ATH10K_SDIO=m CONFIG_ATH10K_SPECTRAL=y CONFIG_ATH10K_TRACING=y CONFIG_ATH10K_USB=m +CONFIG_ATH11K_AHB=m +# CONFIG_ATH11K_DEBUGFS is not set +# CONFIG_ATH11K_DEBUG is not set +CONFIG_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_TRACING is not set # CONFIG_ATH5K_DEBUG is not set CONFIG_ATH5K=m CONFIG_ATH5K_PCI=y @@ -492,6 +504,7 @@ CONFIG_BACKLIGHT_DA903X=m CONFIG_BACKLIGHT_DA9052=m CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_KTD253=m CONFIG_BACKLIGHT_LM3533=m CONFIG_BACKLIGHT_LM3630A=m CONFIG_BACKLIGHT_LM3639=m @@ -698,6 +711,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_JIT=y CONFIG_BPF_KPROBE_OVERRIDE=y # CONFIG_BPF_LSM is not set +# CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y CONFIG_BPF_SYSCALL=y CONFIG_BPF=y @@ -847,6 +861,7 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m +CONFIG_CAN_ISOTP=m CONFIG_CAN_J1939=m CONFIG_CAN_JANZ_ICAN3=m CONFIG_CAN_KVASER_PCIEFD=m @@ -857,6 +872,8 @@ CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PLATFORM=m CONFIG_CAN_M_CAN_TCAN4X5X=m CONFIG_CAN_MCBA_USB=m +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEFD=m @@ -951,6 +968,7 @@ CONFIG_CHARGER_BQ24257=m CONFIG_CHARGER_BQ24735=m CONFIG_CHARGER_BQ2515X=m CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_BQ25980=m CONFIG_CHARGER_CROS_USBPD=m CONFIG_CHARGER_DA9150=m CONFIG_CHARGER_GPIO=m @@ -978,7 +996,8 @@ CONFIG_CHARLCD_BL_FLASH=y CONFIG_CHARLCD=m CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHECK_SIGNATURE=y -CONFIG_CHELSIO_IPSEC_INLINE=y +CONFIG_CHELSIO_INLINE_CRYPTO=y +CONFIG_CHELSIO_IPSEC_INLINE=m CONFIG_CHELSIO_LIB=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1=m @@ -987,7 +1006,7 @@ CONFIG_CHELSIO_T4_DCB=y CONFIG_CHELSIO_T4_FCOE=y CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m -CONFIG_CHELSIO_TLS_DEVICE=y +CONFIG_CHELSIO_TLS_DEVICE=m CONFIG_CHR_DEV_SCH=m CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_ST=m @@ -1452,6 +1471,7 @@ CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SIMD=m CONFIG_CRYPTO_SKCIPHER2=y CONFIG_CRYPTO_SKCIPHER=y +CONFIG_CRYPTO_SM2=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y @@ -1465,8 +1485,10 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API=m +# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER=m @@ -1479,6 +1501,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m CONFIG_CS89x0=m CONFIG_CS89x0_PLATFORM=y +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CUSE=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m @@ -1645,6 +1668,8 @@ CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE_RAID=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set +CONFIG_DMA_OPS=y +# CONFIG_DMA_PERNUMA_CMA is not set CONFIG_DMARD09=m CONFIG_DMARD10=m CONFIG_DMAR_TABLE=y @@ -1702,7 +1727,6 @@ CONFIG_DP83869_PHY=m CONFIG_DP83TC811_PHY=m # CONFIG_DPM_WATCHDOG is not set CONFIG_DPS310=m -CONFIG_DPTF_POWER=m CONFIG_DQL=y CONFIG_DRAGONRISE_FF=y # CONFIG_DRBD_FAULT_INJECTION is not set @@ -1710,6 +1734,7 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC_DCN3_0=y CONFIG_DRM_AMD_DC_DCN=y # CONFIG_DRM_AMD_DC_HDCP is not set +CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMDGPU_CIK=y # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set @@ -2395,6 +2420,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y +CONFIG_FUSE_DAX=y CONFIG_FUSE_FS=y CONFIG_FUSION_CTL=m CONFIG_FUSION_FC=m @@ -2506,6 +2532,8 @@ CONFIG_GPIO_AMD_FCH=m CONFIG_GPIO_AMDPT=m CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_BD9571MWV=m +CONFIG_GPIO_CDEV_V1=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_CRYSTAL_COVE=m CONFIG_GPIO_DA9052=m CONFIG_GPIO_DA9055=m @@ -2547,9 +2575,11 @@ CONFIG_GPIO_PCI_IDIO_16=m CONFIG_GPIO_PISOSR=m CONFIG_GPIO_RC5T583=y CONFIG_GPIO_RDC321X=m +CONFIG_GPIO_REGMAP=m CONFIG_GPIO_SCH311X=m CONFIG_GPIO_SCH=m CONFIG_GPIO_SIOX=m +CONFIG_GPIO_SL28CPLD=m CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS65086=m @@ -2619,6 +2649,7 @@ CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_IDE=y CONFIG_HD44780=m CONFIG_HDC100X=m +CONFIG_HDC2010=m CONFIG_HDLC_CISCO=m CONFIG_HDLC_FR=m CONFIG_HDLC=m @@ -2750,6 +2781,7 @@ CONFIG_HID_U2FZERO=m CONFIG_HID_UCLOGIC=m CONFIG_HID_UDRAW_PS3=m CONFIG_HID_VIEWSONIC=m +CONFIG_HID_VIVALDI=m CONFIG_HID_WACOM=m CONFIG_HID_WALTOP=m CONFIG_HID_WIIMOTE=m @@ -2828,6 +2860,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y CONFIG_HX711=m @@ -3034,6 +3067,7 @@ CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_NG_TEMPLATE=y # CONFIG_IMA_READ_POLICY is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y @@ -3560,6 +3594,7 @@ CONFIG_JFS_STATISTICS=y CONFIG_JME=m CONFIG_JOLIET=y CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADC=m CONFIG_JOYSTICK_ADI=m CONFIG_JOYSTICK_ANALOG=m CONFIG_JOYSTICK_AS5011=m @@ -3655,6 +3690,7 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y +CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y CONFIG_KGDB_SERIAL_CONSOLE=y @@ -3752,6 +3788,7 @@ CONFIG_LEDS_LM36274=m CONFIG_LEDS_LM3642=m CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP3952=m +CONFIG_LEDS_LP50XX=m CONFIG_LEDS_LP8788=m CONFIG_LEDS_MAX8997=m CONFIG_LEDS_MC13783=m @@ -4097,6 +4134,7 @@ CONFIG_MFD_DLN2=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_M10_BMC=m CONFIG_MFD_INTEL_MSIC=y CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m @@ -4131,10 +4169,11 @@ CONFIG_MFD_RETU=m CONFIG_MFD_RT5033=m CONFIG_MFD_SEC_CORE=y CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SIMPLE_MFD_I2C=m CONFIG_MFD_SKY81452=m +CONFIG_MFD_SL28CPLD=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m -CONFIG_MFD_SMSC=y CONFIG_MFD_SYSCON=y CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_TI_LMU=m @@ -4165,8 +4204,8 @@ CONFIG_MFD_WM8400=y CONFIG_MFD_WM8994=m CONFIG_MFD_WM8997=y CONFIG_MFD_WM8998=y +# CONFIG_MHI_BUS_DEBUG is not set CONFIG_MHI_BUS=m -CONFIG_MIC_COSM=m CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m @@ -4357,7 +4396,7 @@ CONFIG_MS5611=m CONFIG_MS5611_SPI=m CONFIG_MS5637=m CONFIG_MS_BLOCK=m -CONFIG_MSCC_OCELOT_SWITCH=m +CONFIG_MSCC_OCELOT_SWITCH_LIB=m CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y CONFIG_MSI_LAPTOP=m @@ -4578,6 +4617,7 @@ CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m CONFIG_NET_DSA_MICROCHIP_KSZ9477=m CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m +CONFIG_NET_DSA_MSCC_SEVILLE=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4986,6 +5026,7 @@ CONFIG_NFS_V3=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_V4_1_MIGRATION=y CONFIG_NFS_V4_1=y +# CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFS_V4_2=y CONFIG_NFS_V4=m CONFIG_NFS_V4_SECURITY_LABEL=y @@ -5041,6 +5082,7 @@ CONFIG_N_HDLC=m CONFIG_NI903X_WDT=m CONFIG_NIC7018_WDT=m CONFIG_NILFS2_FS=m +CONFIG_NITRO_ENCLAVES=m CONFIG_NIU=m CONFIG_NI_XGE_MANAGEMENT_ENET=m # CONFIG_NL80211_TESTMODE is not set @@ -5328,6 +5370,11 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set CONFIG_PCIEASPM=y +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_PEER2PEER is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_TUNE_OFF is not set # CONFIG_PCIE_BW is not set CONFIG_PCIE_DPC=y CONFIG_PCIE_DW_EP=y @@ -5386,7 +5433,9 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_XIRCOM=m CONFIG_PCNET32=m +CONFIG_PCS_LYNX=m CONFIG_PCSPKR_PLATFORM=y +CONFIG_PCS_XPCS=m CONFIG_PD6729=m CONFIG_PDA_POWER=m CONFIG_PDC_ADMA=m @@ -5400,11 +5449,10 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_PERF_EVENTS=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_PGTABLE_LEVELS=4 -CONFIG_PGTABLE_MAPPING=y CONFIG_PHANTOM=m CONFIG_PHONET=m CONFIG_PHY_CPCAP_USB=m -CONFIG_PHY_INTEL_EMMC=m +CONFIG_PHY_INTEL_LGM_EMMC=m CONFIG_PHYLIB=y CONFIG_PHYLINK=m CONFIG_PHY_PXA_28NM_HSIC=m @@ -5435,7 +5483,7 @@ CONFIG_PINCTRL_DENVERTON=m CONFIG_PINCTRL_EMMITSBURG=m CONFIG_PINCTRL_GEMINILAKE=m CONFIG_PINCTRL_ICELAKE=m -CONFIG_PINCTRL_INTEL=m +CONFIG_PINCTRL_INTEL=y CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LEWISBURG=m CONFIG_PINCTRL_LYNXPOINT=m @@ -5494,7 +5542,6 @@ CONFIG_PNP=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_TIMERS=y -CONFIG_POWER_AVS=y CONFIG_POWERCAP=y # CONFIG_POWER_RESET_MT6323 is not set CONFIG_POWER_RESET_RESTART=y @@ -5530,6 +5577,8 @@ CONFIG_PREEMPT_RCU=y # CONFIG_PREEMPT_TRACER is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y +CONFIG_PRESTERA=m +CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_PRIME_NUMBERS is not set CONFIG_PRINTER=m @@ -5601,14 +5650,15 @@ CONFIG_PWM_LPSS_PCI=y CONFIG_PWM_LPSS_PLATFORM=y CONFIG_PWM_LPSS=y CONFIG_PWM_PCA9685=m +CONFIG_PWM_SL28CPLD=m CONFIG_PWM_SYSFS=y CONFIG_PWM_TWL_LED=m CONFIG_PWM_TWL=m CONFIG_PWM=y -CONFIG_QCOM_CPR=m CONFIG_QCOM_EMAC=m CONFIG_QCOM_HIDMA=m CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_QMI_HELPERS=m CONFIG_QCOM_SPMI_ADC5=m CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_VADC=m @@ -5708,8 +5758,9 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_PERF_TEST=m +# CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_REF_SCALE_TEST is not set +# CONFIG_RCU_SCALE_TEST is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set @@ -5743,6 +5794,7 @@ CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_SCCB=m CONFIG_REGMAP_SLIMBUS=m CONFIG_REGMAP_SOUNDWIRE=m +CONFIG_REGMAP_SPI_AVMM=m CONFIG_REGMAP_SPI=y CONFIG_REGMAP_SPMI=m CONFIG_REGMAP_W1=m @@ -5798,6 +5850,7 @@ CONFIG_REGULATOR_MP8859=m CONFIG_REGULATOR_MT6311=m CONFIG_REGULATOR_MT6323=m CONFIG_REGULATOR_MT6358=m +CONFIG_REGULATOR_MT6360=m CONFIG_REGULATOR_MT6397=m CONFIG_REGULATOR_PALMAS=m CONFIG_REGULATOR_PCA9450=m @@ -5811,8 +5864,11 @@ CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_QCOM_LABIBB=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RC5T583=m +CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -5879,6 +5935,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y +CONFIG_RMI4_F3A=y CONFIG_RMI4_F54=y CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m @@ -6018,6 +6075,7 @@ CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_RV3028=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029_HWMON=y +CONFIG_RTC_DRV_RV3032=m CONFIG_RTC_DRV_RV8803=m CONFIG_RTC_DRV_RX4581=m CONFIG_RTC_DRV_RX6110=m @@ -6154,6 +6212,7 @@ CONFIG_SCA3000=m CONFIG_SCD30_CORE=m CONFIG_SCD30_I2C=m CONFIG_SCD30_SERIAL=m +# CONFIG_SCF_TORTURE_TEST is not set CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_DEBUG=y CONFIG_SCHED_HRTICK=y @@ -6166,8 +6225,6 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_SCHEDSTATS=y # CONFIG_SCHED_THERMAL_PRESSURE is not set CONFIG_SCHED_TRACER=y -CONFIG_SCIF_BUS=m -CONFIG_SCIF=m CONFIG_SCR24X=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m @@ -6324,6 +6381,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM1177=m +CONFIG_SENSORS_ADM1266=m CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM9240=m CONFIG_SENSORS_ADS7828=m @@ -6385,6 +6443,7 @@ CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA3221=m CONFIG_SENSORS_INSPUR_IPSPS=m +CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m CONFIG_SENSORS_IR35221=m CONFIG_SENSORS_IR38064=m CONFIG_SENSORS_IRPS5401=m @@ -6454,6 +6513,8 @@ CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_MENF21BMC_HWMON=m CONFIG_SENSORS_MLXREG_FAN=m +CONFIG_SENSORS_MP2975=m +CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m @@ -6477,6 +6538,7 @@ CONFIG_SENSORS_SHT21=m CONFIG_SENSORS_SHT3x=m CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SL28CPLD=m CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_SMSC47M192=m @@ -6619,6 +6681,7 @@ CONFIG_SKGE_GENESIS=y CONFIG_SKGE=m # CONFIG_SKY2_DEBUG is not set CONFIG_SKY2=m +CONFIG_SL28CPLD_WATCHDOG=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set @@ -6730,6 +6793,7 @@ CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_CORE=m CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_EXT_CORE=m +CONFIG_SND_HDA_GENERIC_LEDS=y CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_I915=y @@ -6854,6 +6918,7 @@ CONFIG_SND_SOC_CS35L33=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m +CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m CONFIG_SND_SOC_CS4270=m CONFIG_SND_SOC_CS4271_I2C=m @@ -6918,6 +6983,7 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m +CONFIG_SND_SOC_INTEL_CATPT=m CONFIG_SND_SOC_INTEL_CFL=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m @@ -6928,7 +6994,6 @@ CONFIG_SND_SOC_INTEL_CML_LP=m CONFIG_SND_SOC_INTEL_CNL=m CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m CONFIG_SND_SOC_INTEL_GLK=m -CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m @@ -6948,8 +7013,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m -CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set @@ -7033,6 +7096,8 @@ CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m CONFIG_SND_SOC_SOF_ACPI=m CONFIG_SND_SOC_SOF_APOLLOLAKE=m CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_BROADWELL=m +CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y CONFIG_SND_SOC_SOF_CANNONLAKE=m CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_COFFEELAKE=m @@ -7057,6 +7122,9 @@ CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m CONFIG_SND_SOC_SOF_INTEL_COMMON=m CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_PCI=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y # CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set CONFIG_SND_SOC_SOF=m @@ -7078,6 +7146,7 @@ CONFIG_SND_SOC_STA350=m CONFIG_SND_SOC_STI_SAS=m CONFIG_SND_SOC_TAS2552=m CONFIG_SND_SOC_TAS2562=m +CONFIG_SND_SOC_TAS2764=m CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m @@ -7138,9 +7207,6 @@ CONFIG_SND_SPI=y CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m -CONFIG_SND_SST_IPC_ACPI=m -CONFIG_SND_SST_IPC=m -CONFIG_SND_SST_IPC_PCI=m CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_SYNTH_EMUX=m CONFIG_SND_TIMER=m @@ -7187,6 +7253,7 @@ CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set CONFIG_SOUND_OSS_CORE=y CONFIG_SOUNDWIRE_CADENCE=m +CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m CONFIG_SOUNDWIRE_INTEL=m CONFIG_SOUNDWIRE_QCOM=m CONFIG_SOUNDWIRE=y @@ -7209,6 +7276,7 @@ CONFIG_SPI_DLN2=m CONFIG_SPI_DW_DMA=y CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DYNAMIC=y CONFIG_SPI_GPIO=m # CONFIG_SPI_INTEL_SPI_PCI is not set # CONFIG_SPI_INTEL_SPI_PLATFORM is not set @@ -7236,6 +7304,7 @@ CONFIG_SPI_XCOMM=m CONFIG_SPI=y CONFIG_SPI_ZYNQMP_GQSPI=m CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_SPMI_HISI3670=m CONFIG_SPMI=m CONFIG_SPS30=m # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set @@ -7282,6 +7351,7 @@ CONFIG_STAGING_GASKET_FRAMEWORK=m CONFIG_STAGING_MEDIA=y CONFIG_STAGING=y # CONFIG_STANDALONE is not set +# CONFIG_STATIC_CALL_SELFTEST is not set # CONFIG_STATIC_KEYS_SELFTEST is not set # CONFIG_STATIC_USERMODEHELPER is not set CONFIG_STE10XP=m @@ -7552,7 +7622,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y CONFIG_TOPSTAR_LAPTOP=m -CONFIG_TORTURE_TEST=m +# CONFIG_TORTURE_TEST is not set CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_TOSHIBA_HAPS=m CONFIG_TOSHIBA_WMI=m @@ -7658,6 +7728,7 @@ CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_ZET6223=m CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_TOUCHSCREEN_ZINITIX=m CONFIG_TPL0102=m CONFIG_TPM_KEY_PARSER=m CONFIG_TPS6105X=m @@ -7707,11 +7778,14 @@ CONFIG_TYPEC_DP_ALTMODE=m CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC=m +CONFIG_TYPEC_MT6360=m CONFIG_TYPEC_MUX_INTEL_PMC=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_NVIDIA_ALTMODE=m CONFIG_TYPEC_RT1711H=m +CONFIG_TYPEC_STUSB160X=m CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_TCPCI_MAXIM=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m CONFIG_TYPEC_UCSI=m @@ -7775,6 +7849,7 @@ CONFIG_UNWINDER_FRAME_POINTER=y CONFIG_UPROBE_EVENTS=y CONFIG_UPROBES=y CONFIG_US5182D=m +# CONFIG_USB4_DEBUGFS_WRITE is not set CONFIG_USB4=m CONFIG_USB4_NET=m CONFIG_USB_ACM=m @@ -7868,6 +7943,7 @@ CONFIG_USB_EZUSB_FX2=m CONFIG_USB_F_ACM=m CONFIG_USB_F_ECM=m CONFIG_USB_F_EEM=m +# CONFIG_USB_FEW_INIT_RETRIES is not set CONFIG_USB_F_FS=m CONFIG_USB_F_HID=m CONFIG_USB_F_MASS_STORAGE=m @@ -8001,6 +8077,7 @@ CONFIG_USB_LD=m CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LGM_PHY=m CONFIG_USB_LIBCOMPOSITE=m CONFIG_USB_LINK_LAYER_TEST=m CONFIG_USB_M5602=m @@ -8077,7 +8154,7 @@ CONFIG_USB_RAINSHADOW_CEC=m CONFIG_USB_RAREMONO=m CONFIG_USB_RAW_GADGET=m CONFIG_USB_ROLES_INTEL_XHCI=m -CONFIG_USB_ROLE_SWITCH=m +CONFIG_USB_ROLE_SWITCH=y CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_S2255=m @@ -8199,6 +8276,7 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_USERFAULTFD=y CONFIG_U_SERIAL_CONSOLE=y CONFIG_USERIO=m +CONFIG_USERMODE_DRIVER=y CONFIG_USER_NS=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_USER_STACKTRACE_SUPPORT=y @@ -8455,7 +8533,6 @@ CONFIG_VIDEO_UDA1342=m CONFIG_VIDEO_UPD64031A=m CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_USBTV=m -CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y @@ -8465,12 +8542,14 @@ CONFIG_VIDEO_VPX3220=m CONFIG_VIDEO_VS6624=m CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_ZORAN is not set CONFIG_VIPERBOARD_ADC=m # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_DMA_SHARED_BUFFER=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MEM=m @@ -8508,8 +8587,6 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m -CONFIG_VOP_BUS=m -CONFIG_VOP=m CONFIG_VORTEX=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m @@ -8784,6 +8861,7 @@ CONFIG_XFRM_IPCOMP=m CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_STATISTICS=y # CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_USER_COMPAT=m CONFIG_XFRM_USER=m CONFIG_XFRM=y # CONFIG_XFS_DEBUG is not set @@ -8792,6 +8870,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y +CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set CONFIG_XIAOMI_WMI=m CONFIG_XILINX_AXI_EMAC=m diff --git a/kernel.spec b/kernel.spec index 5c413cd..fb77cf7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,7 +1,7 @@ %define kernelversion 5 -%define patchlevel 9 +%define patchlevel 10 # sublevel is used for stable-based kernels -%define sublevel 14 +%define sublevel 3 # Release number. Increase this before a rebuild. %define rpmrel 1 diff --git a/objtool-sync-check.sh-set-the-exit-code-explicitly.patch b/objtool-sync-check.sh-set-the-exit-code-explicitly.patch index 0088b9a..2f0fea1 100644 --- a/objtool-sync-check.sh-set-the-exit-code-explicitly.patch +++ b/objtool-sync-check.sh-set-the-exit-code-explicitly.patch @@ -18,15 +18,16 @@ Signed-off-by: Evgenii Shatokhin 1 file changed, 2 insertions(+) diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh -index 2a1261bfbb62..f23bd02c1b77 100755 +index 606a4b5e929f..debdd5d85124 100755 --- a/tools/objtool/sync-check.sh +++ b/tools/objtool/sync-check.sh -@@ -48,3 +48,5 @@ check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[ - check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' - check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' - check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' +@@ -63,3 +63,6 @@ while read -r file_entry; do + done <