From 394e211aa7bdea5be3cf821b954e6de4c6d20049 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 30 Mar 2020 11:46:00 +0200 Subject: [PATCH 1/1] - up to 5.6.0 --- kernel-aufs5.patch | 148 +++++++++++++------------- kernel-multiarch.config | 229 +++++++++++++++++++++++++++++----------- kernel.spec | 11 +- linux-wistron-nx.patch | 4 +- 4 files changed, 246 insertions(+), 146 deletions(-) diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch index ad3f938c..a1934da9 100644 --- a/kernel-aufs5.patch +++ b/kernel-aufs5.patch @@ -2,34 +2,34 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig -index 7b623e9fc1b0..9070b9159188 100644 +index 708ba336e689..84eedbf8654e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -264,6 +264,7 @@ source "fs/pstore/Kconfig" - source "fs/sysv/Kconfig" +@@ -266,6 +266,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/erofs/Kconfig" + source "fs/vboxsf/Kconfig" +source "fs/aufs/Kconfig" endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile -index 1148c555c4d3..ed6ff7ddc478 100644 +index 505e51166973..d53a5678fd7d 100644 --- a/fs/Makefile +++ b/fs/Makefile -@@ -133,3 +133,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/ - obj-$(CONFIG_PSTORE) += pstore/ - obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ obj-$(CONFIG_EROFS_FS) += erofs/ + obj-$(CONFIG_VBOXSF_FS) += vboxsf/ + obj-$(CONFIG_ZONEFS_FS) += zonefs/ +obj-$(CONFIG_AUFS_FS) += aufs/ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN base patch diff --git a/MAINTAINERS b/MAINTAINERS -index cf6ccca6e61c..c3b9b0d405fd 100644 +index fcd79fc38928..9751b7b48696 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2877,6 +2877,19 @@ F: include/linux/audit.h +@@ -2919,6 +2919,19 @@ F: include/linux/audit.h F: include/uapi/linux/audit.h F: kernel/audit* @@ -114,20 +114,20 @@ index 9bc167562ee8..b0935c67bd1e 100644 return error; diff --git a/fs/inode.c b/fs/inode.c -index 96d62d97694e..31796c1040d6 100644 +index 7d57068b6b7a..c5a5578773d4 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -1680,7 +1680,7 @@ EXPORT_SYMBOL(generic_update_time); +@@ -1687,7 +1687,7 @@ 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. */ -static int update_time(struct inode *inode, struct timespec64 *time, int flags) +int update_time(struct inode *inode, struct timespec64 *time, int flags) { - int (*update_time)(struct inode *, struct timespec64 *, int); - + if (inode->i_op->update_time) + return inode->i_op->update_time(inode, time, flags); diff --git a/fs/namespace.c b/fs/namespace.c -index 5e1bf611a9eb..c05ac2488abb 100644 +index 85b5f7bea82e..c742051ba969 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -776,6 +776,12 @@ static inline int check_mnt(struct mount *mnt) @@ -144,7 +144,7 @@ index 5e1bf611a9eb..c05ac2488abb 100644 * vfsmount lock must be held for write */ diff --git a/fs/read_write.c b/fs/read_write.c -index 5bbf587f5bc1..fa9b3994b34c 100644 +index 59d819c5b92e..bcb853105beb 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -498,6 +498,28 @@ static ssize_t __vfs_write(struct file *file, const char __user *p, @@ -177,7 +177,7 @@ index 5bbf587f5bc1..fa9b3994b34c 100644 { mm_segment_t old_fs; diff --git a/fs/splice.c b/fs/splice.c -index 3009652a41c8..d9bcc4a71a0a 100644 +index d671936d0aad..b1f536d03c09 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -849,8 +849,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); @@ -218,7 +218,7 @@ index 4d1ff010bc5a..457f4e4a5cc1 100644 if (wait) sync_inodes_sb(sb); diff --git a/include/linux/fs.h b/include/linux/fs.h -index 98e0349adb52..5fc7807f7c2e 100644 +index 3cd4fe6b845e..6d1e37a014f3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1349,6 +1349,7 @@ extern void fasync_free(struct fasync_struct *); @@ -229,7 +229,7 @@ index 98e0349adb52..5fc7807f7c2e 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); -@@ -1842,6 +1843,7 @@ struct file_operations { +@@ -1841,6 +1842,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); @@ -237,7 +237,7 @@ index 98e0349adb52..5fc7807f7c2e 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); -@@ -1912,6 +1914,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, +@@ -1911,6 +1913,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, struct iovec *fast_pointer, struct iovec **ret_pointer); @@ -250,7 +250,7 @@ index 98e0349adb52..5fc7807f7c2e 100644 extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); 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 *); -@@ -2332,6 +2340,7 @@ extern int current_umask(void); +@@ -2343,6 +2351,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); @@ -258,7 +258,7 @@ index 98e0349adb52..5fc7807f7c2e 100644 /* /sys/fs */ extern struct kobject *fs_kobj; -@@ -2620,6 +2629,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) +@@ -2627,6 +2636,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) return false; } #endif @@ -267,7 +267,7 @@ index 98e0349adb52..5fc7807f7c2e 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 c50d01ef1414..4f4677020360 100644 +index 664f52c6dd4c..f2208851f527 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -331,6 +331,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -346,10 +346,10 @@ SPDX-License-Identifier: GPL-2.0 aufs5.x-rcN mmap patch diff --git a/fs/proc/base.c b/fs/proc/base.c -index ebea9501afb8..dc7edc5f7267 100644 +index c7c64272b0fa..76d99aea5ae2 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2037,7 +2037,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) +@@ -2128,7 +2128,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) { @@ -375,7 +375,7 @@ index 14c2badb8fd9..65afe5287e43 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 9442631fd4af..1fa8a5fcdeee 100644 +index 3ba9ae83bff5..397c33e0acbe 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -416,10 +416,10 @@ index 7907e6419e57..d17209cf52bc 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 cfaa8feecfe8..b66c4c536ac5 100644 +index 52269e56c514..32aa6b1ea1d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1495,6 +1495,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1487,6 +1487,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -449,7 +449,7 @@ index cfaa8feecfe8..b66c4c536ac5 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 270aa8fd2800..33848c2165e2 100644 +index c28911c3afa8..23d069c0e171 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -267,6 +267,7 @@ struct vm_region { @@ -460,7 +460,7 @@ index 270aa8fd2800..33848c2165e2 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 -@@ -341,6 +342,7 @@ struct vm_area_struct { +@@ -346,6 +347,7 @@ 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). */ @@ -469,7 +469,7 @@ index 270aa8fd2800..33848c2165e2 100644 #ifdef CONFIG_SWAP diff --git a/kernel/fork.c b/kernel/fork.c -index 080809560072..968e4dc2279f 100644 +index 60a1295f4384..44682dd97ca6 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -565,7 +565,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -482,10 +482,10 @@ index 080809560072..968e4dc2279f 100644 atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); diff --git a/mm/Makefile b/mm/Makefile -index 1937cc251883..778c1e399903 100644 +index 272e66039e70..c8ff3d955c27 100644 --- a/mm/Makefile +++ b/mm/Makefile -@@ -42,7 +42,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ +@@ -43,7 +43,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ @@ -495,10 +495,10 @@ index 1937cc251883..778c1e399903 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 bf6aa30be58d..32ca075c0c8b 100644 +index 1784478270e1..fb03735cd00e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2675,7 +2675,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -2653,7 +2653,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) vm_fault_t ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); @@ -508,7 +508,7 @@ index bf6aa30be58d..32ca075c0c8b 100644 if (page->mapping != inode->i_mapping) { unlock_page(page); diff --git a/mm/mmap.c b/mm/mmap.c -index 71e4ffc83bcd..7256e8b985eb 100644 +index d681a20eb4ea..36c80ae89cee 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -176,7 +176,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -520,7 +520,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 mpol_put(vma_policy(vma)); vm_area_free(vma); return next; -@@ -909,7 +909,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, +@@ -907,7 +907,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); @@ -529,7 +529,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 } if (next->anon_vma) anon_vma_merge(vma, next); -@@ -1837,8 +1837,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1829,8 +1829,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, return addr; unmap_and_free_vma: @@ -539,7 +539,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2667,7 +2667,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2659,7 +2659,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, goto out_free_mpol; if (new->vm_file) @@ -548,7 +548,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2686,7 +2686,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2678,7 +2678,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) @@ -557,7 +557,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2878,7 +2878,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2870,7 +2870,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; @@ -566,7 +566,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -2953,10 +2953,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2945,10 +2945,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, } } @@ -595,7 +595,7 @@ index 71e4ffc83bcd..7256e8b985eb 100644 out: up_write(&mm->mmap_sem); if (populate) -@@ -3247,7 +3264,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3239,7 +3256,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) @@ -764,7 +764,7 @@ index 046000653e4d..15aa871d1b45 100644 /** * d_ancestor - search for an ancestor diff --git a/fs/exec.c b/fs/exec.c -index 74d88dab98dd..71eb4fcace94 100644 +index db17be51b112..4bb61917a29a 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) @@ -808,19 +808,19 @@ index 30d55c9a1744..34b9bbf4c556 100644 void __init files_init(void) { diff --git a/fs/inode.c b/fs/inode.c -index 31796c1040d6..217169541ac4 100644 +index c5a5578773d4..5995e737f64a 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -1689,6 +1689,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) - - return update_time(inode, time, flags); +@@ -1693,6 +1693,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags) + return inode->i_op->update_time(inode, time, flags); + return generic_update_time(inode, time, flags); } +EXPORT_SYMBOL_GPL(update_time); /** * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index c05ac2488abb..100b7839c8b0 100644 +index c742051ba969..e02a680b7fe9 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -860,7 +860,7 @@ index 133f723aca07..0b9f7f6d8390 100644 /* * Drop a reference to a group. Free it if it's through. diff --git a/fs/open.c b/fs/open.c -index b62f5c0923a8..89af4b9c7319 100644 +index 0788b3715731..cec8ceac6f16 100644 --- a/fs/open.c +++ b/fs/open.c @@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -872,7 +872,7 @@ index b62f5c0923a8..89af4b9c7319 100644 long vfs_truncate(const struct path *path, loff_t length) { diff --git a/fs/read_write.c b/fs/read_write.c -index fa9b3994b34c..eb0e2c6ebaff 100644 +index bcb853105beb..e54db6078e3f 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -908,7 +908,7 @@ index fa9b3994b34c..eb0e2c6ebaff 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 d9bcc4a71a0a..bf8725e99070 100644 +index b1f536d03c09..0872306175b4 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, @@ -973,10 +973,10 @@ index 0fef395662a6..83fb1ecfc33d 100644 } +EXPORT_SYMBOL_GPL(task_work_run); diff --git a/security/security.c b/security/security.c -index cd2d18d2d279..fbf716450399 100644 +index 565bc9b67276..248a63945e9f 100644 --- a/security/security.c +++ b/security/security.c -@@ -1036,6 +1036,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) +@@ -1068,6 +1068,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) return 0; return call_int_hook(path_rmdir, 0, dir, dentry); } @@ -984,7 +984,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_unlink(const struct path *dir, struct dentry *dentry) { -@@ -1052,6 +1053,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, +@@ -1084,6 +1085,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); } @@ -992,7 +992,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_link(struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry) -@@ -1060,6 +1062,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, +@@ -1092,6 +1094,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); } @@ -1000,7 +1000,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, const struct path *new_dir, struct dentry *new_dentry, -@@ -1087,6 +1090,7 @@ int security_path_truncate(const struct path *path) +@@ -1119,6 +1122,7 @@ int security_path_truncate(const struct path *path) return 0; return call_int_hook(path_truncate, 0, path); } @@ -1008,7 +1008,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_chmod(const struct path *path, umode_t mode) { -@@ -1094,6 +1098,7 @@ int security_path_chmod(const struct path *path, umode_t mode) +@@ -1126,6 +1130,7 @@ int security_path_chmod(const struct path *path, umode_t mode) return 0; return call_int_hook(path_chmod, 0, path, mode); } @@ -1016,7 +1016,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) { -@@ -1101,6 +1106,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) +@@ -1133,6 +1138,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); } @@ -1024,7 +1024,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_path_chroot(const struct path *path) { -@@ -1201,6 +1207,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -1233,6 +1239,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return call_int_hook(inode_permission, 0, inode, mask); } @@ -1032,7 +1032,7 @@ index cd2d18d2d279..fbf716450399 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -1378,6 +1385,7 @@ int security_file_permission(struct file *file, int mask) +@@ -1410,6 +1417,7 @@ int security_file_permission(struct file *file, int mask) return fsnotify_perm(file, mask); } @@ -28475,8 +28475,8 @@ 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 2020-01-27 10:57:18.175538316 +0100 -@@ -0,0 +1,171 @@ ++++ linux/fs/aufs/procfs.c 2020-03-30 09:50:57.598730603 +0200 +@@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2010-2020 Junjiro R. Okajima @@ -28608,10 +28608,9 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c + return err; +} + -+static const struct file_operations au_procfs_plm_fop = { -+ .write = au_procfs_plm_write, -+ .release = au_procfs_plm_release, -+ .owner = THIS_MODULE ++static const struct proc_ops au_procfs_plm_op = { ++ .proc_write = au_procfs_plm_write, ++ .proc_release = au_procfs_plm_release +}; + +/* ---------------------------------------------------------------------- */ @@ -28635,7 +28634,7 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c + goto out; + + entry = proc_create(AUFS_PLINK_MAINT_NAME, S_IFREG | 0200, -+ au_procfs_dir, &au_procfs_plm_fop); ++ au_procfs_dir, &au_procfs_plm_op); + if (unlikely(!entry)) + goto out_dir; + @@ -36794,8 +36793,8 @@ 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 2020-01-27 10:57:18.182205184 +0100 -@@ -0,0 +1,1965 @@ ++++ linux/fs/aufs/xino.c 2020-03-30 09:50:57.598730603 +0200 +@@ -0,0 +1,1966 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005-2020 Junjiro R. Okajima @@ -38155,7 +38154,8 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c + hlist_bl_lock(hbl); + hlist_bl_for_each_entry_safe(p, pos, n, hbl, node) { + hlist_bl_del(&p->node); -+ au_kfree_rcu(p); ++ /* kmemleak reported au_kfree_rcu() doesn't free it */ ++ kfree(p); + } + hlist_bl_unlock(hbl); + } @@ -38763,7 +38763,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 2020-01-27 10:57:18.182205184 +0100 ++++ linux/include/uapi/linux/aufs_type.h 2020-03-30 09:50:57.598730603 +0200 @@ -0,0 +1,452 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* @@ -38807,7 +38807,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-20200127" ++#define AUFS_VERSION "5.x-rcN-20200302" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') @@ -39447,10 +39447,10 @@ index 589dd0122020..801e0a7faec5 100644 /* ---------------------------------------------------------------------- */ diff --git a/include/linux/fs.h b/include/linux/fs.h -index 5fc7807f7c2e..07e24e72706e 100644 +index 6d1e37a014f3..ce2c9b4bae13 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1980,6 +1980,10 @@ struct super_operations { +@@ -1979,6 +1979,10 @@ struct super_operations { struct shrink_control *); long (*free_cached_objects)(struct super_block *, struct shrink_control *); diff --git a/kernel-multiarch.config b/kernel-multiarch.config index a6ee0ad8..363f9e4c 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -599,7 +599,6 @@ SUNVDC sparc64=m XEN_BLKDEV_FRONTEND all=m XEN_BLKDEV_BACKEND all=m VIRTIO_BLK all=m -VIRTIO_BLK_SCSI all=y BLK_DEV_RBD all=m BLK_DEV_RSXX all=m @@ -1037,6 +1036,14 @@ SYNC_FILE all=y SW_SYNC all=y UDMABUF all=y DMABUF_SELFTESTS all=m +DMABUF_HEAPS all=y +#- file drivers/dma-buf/heaps/Kconfig goes here + +#- +#- *** FILE: drivers/dma-buf/heaps/Kconfig *** +#- +DMABUF_HEAPS_SYSTEM all=y +DMABUF_HEAPS_CMA all=y #- #- *** FILE: drivers/dma/Kconfig *** @@ -1048,9 +1055,11 @@ DMA_ENGINE all=y ALTERA_MSGDMA all=m FSL_DMA ppc=y ppc64=y INTEL_IDMA64 all=m +INTEL_IDXD all=m INTEL_IOATDMA i386=m x86_64=m INTEL_MIC_X100_DMA all=m PCH_DMA all=m +PLX_DMA all=m TIMB_DMA all=m #- file drivers/dma/bestcomm/Kconfig goes here #- file drivers/dma/mediatek/Kconfig goes here @@ -1204,8 +1213,10 @@ EFI_SOFT_RESERVE all=y EFI_BOOTLOADER_CONTROL all=m EFI_CAPSULE_LOADER all=m EFI_TEST all=m +APPLE_PROPERTIES all=y RESET_ATTACK_MITIGATION all=y EFI_RCI2_TABLE all=y +EFI_DISABLE_PCI_DMA all=n #- #- *** FILE: drivers/firmware/google/Kconfig *** @@ -1270,7 +1281,6 @@ GPIO_DWAPB all=m GPIO_EXAR all=m GPIO_GENERIC_PLATFORM all=m GPIO_ICH all=m -GPIO_LYNXPOINT all=y GPIO_MB86S7X all=m GPIO_MENZ127 all=m GPIO_SIOX all=m @@ -1434,10 +1444,6 @@ HSA_AMD all=y #- *** FILE: drivers/gpu/drm/amd/display/Kconfig *** #- DRM_AMD_DC all=y -DRM_AMD_DC_DCN1_0 all=y -DRM_AMD_DC_DCN2_0 all=y -DRM_AMD_DC_DCN2_1 all=y -DRM_AMD_DC_DSC_SUPPORT all=y DRM_AMD_DC_HDCP all=y DEBUG_KERNEL_DC all=n @@ -1452,17 +1458,14 @@ DRM_AST all=m DRM_BOCHS all=m #- -#- *** FILE: drivers/gpu/drm/bridge/Kconfig *** +#- *** FILE: drivers/gpu/drm/bridge/adv7511/Kconfig *** #- -DRM_ANALOGIX_ANX78XX all=m -#- file drivers/gpu/drm/bridge/analogix/Kconfig goes here -#- file drivers/gpu/drm/bridge/adv7511/Kconfig goes here -#- file drivers/gpu/drm/bridge/synopsys/Kconfig goes here +DRM_I2C_ADV7511 all=m #- -#- *** FILE: drivers/gpu/drm/bridge/adv7511/Kconfig *** +#- *** FILE: drivers/gpu/drm/bridge/analogix/Kconfig *** #- -DRM_I2C_ADV7511 all=m +DRM_ANALOGIX_ANX78XX all=m #- #- *** FILE: drivers/gpu/drm/cirrus/Kconfig *** @@ -1770,6 +1773,7 @@ SENSORS_ADM1025 all=m SENSORS_ADM1026 all=m SENSORS_ADM1029 all=m SENSORS_ADM1031 all=m +SENSORS_ADM1177 all=m SENSORS_ADM9240 all=m SENSORS_ADT7310 all=m SENSORS_ADT7410 all=m @@ -1787,6 +1791,7 @@ SENSORS_ARM_SCPI all=m SENSORS_ASB100 all=m SENSORS_ASPEED all=m SENSORS_ATXP1 all=m +SENSORS_DRIVETEMP all=m SENSORS_DS620 all=m SENSORS_DS1621 all=m SENSORS_DA9052_ADC all=m @@ -1828,6 +1833,7 @@ SENSORS_MAX1619 all=m SENSORS_MAX1668 all=m SENSORS_MAX197 all=m SENSORS_MAX31722 all=m +SENSORS_MAX31730 all=m SENSORS_MAX6621 all=m SENSORS_MAX6639 all=m SENSORS_MAX6642 all=m @@ -1943,6 +1949,7 @@ SENSORS_LTC2978 all=m SENSORS_LTC2978_REGULATOR all=y SENSORS_LTC3815 all=m SENSORS_MAX16064 all=m +SENSORS_MAX20730 all=m SENSORS_MAX20751 all=m SENSORS_MAX31785 all=m SENSORS_MAX34440 all=m @@ -1952,6 +1959,7 @@ SENSORS_TPS40422 all=m SENSORS_TPS53679 all=m SENSORS_UCD9000 all=m SENSORS_UCD9200 all=m +SENSORS_XDPE122 all=m SENSORS_ZL6100 all=m #- @@ -2059,7 +2067,6 @@ I2C_XILINX all=m I2C_DIOLAN_U2C all=m I2C_DLN2 all=m I2C_PARPORT all=m -I2C_PARPORT_LIGHT all=m I2C_ROBOTFUZZ_OSIF all=m I2C_TAOS_EVM all=m I2C_TINY_USB all=m @@ -2215,6 +2222,7 @@ ADXL372_SPI all=m ADXL372_I2C all=m BMA180 all=m BMA220 all=m +BMA400 all=m BMC150_ACCEL all=m DA280 all=m DA311 all=m @@ -2244,6 +2252,7 @@ STK8BA50 all=m #- *** FILE: drivers/iio/adc/Kconfig *** #- AB8500_GPADC all=y +AD7091R5 all=m AD7124 all=m AD7266 all=m AD7291 all=m @@ -2272,6 +2281,7 @@ HX711 all=m INA2XX_ADC all=m LTC2471 all=m LTC2485 all=m +LTC2496 all=m LTC2497 all=m MAX1027 all=m MAX11100 all=m @@ -2555,6 +2565,7 @@ LMP91000 all=m ABP060MG all=m BMP280 all=m IIO_CROS_EC_BARO all=m +DLHL60D all=m DPS310 all=m HID_SENSOR_PRESS all=m HP03 all=m @@ -2578,6 +2589,7 @@ AS3935 all=m ISL29501 all=m LIDAR_LITE_V2 all=m MB1232 all=m +PING all=m RFD77402 all=m SRF04 all=m SX9500 all=m @@ -3138,6 +3150,7 @@ AMD_IOMMU_V2 all=m INTEL_IOMMU all=y INTEL_IOMMU_SVM all=y INTEL_IOMMU_DEFAULT_ON all=y +INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON all=y IRQ_REMAP all=y HYPERV_IOMMU all=y @@ -3175,9 +3188,7 @@ ISDN all=y s390=n #- ISDN_CAPI all=m CAPI_TRACE all=y -ISDN_CAPI_CAPI20 all=m ISDN_CAPI_MIDDLEWARE all=y -ISDN_CAPI_CAPIDRV_VERBOSE all=y #- #- *** FILE: drivers/isdn/hardware/mISDN/Kconfig *** @@ -3258,6 +3269,7 @@ LEDS_USER all=m LEDS_NIC78BX all=m LEDS_TI_LMU_COMMON all=m LEDS_LM36274 all=m +LEDS_TPS6105X all=m #- LED Triggers #- file drivers/leds/trigger/Kconfig goes here @@ -4465,6 +4477,7 @@ MFD_WM831X all=y MFD_WM831X_SPI all=y MFD_WM8350_I2C all=y MFD_WM8994 all=m +MFD_WCD934X all=m RAVE_SP_CORE all=m #- @@ -4860,6 +4873,8 @@ MII all=m NET_CORE all=y BONDING all=m DUMMY all=m +WIREGUARD all=m +WIREGUARD_DEBUG all=n EQUALIZER all=m NET_FC all=y IFB all=m @@ -4907,7 +4922,7 @@ XEN_NETDEV_FRONTEND all=m XEN_NETDEV_BACKEND all=m VMXNET3 all=m FUJITSU_ES all=m -THUNDERBOLT_NET all=m +USB4_NET all=m #- file drivers/net/hyperv/Kconfig goes here NETDEVSIM all=m NET_FAILOVER all=m @@ -5059,11 +5074,14 @@ NET_DSA_MV88E6060 all=m #- file drivers/net/dsa/microchip/Kconfig goes here #- file drivers/net/dsa/mv88e6xxx/Kconfig goes here #- file drivers/net/dsa/ocelot/Kconfig goes here +#- file drivers/net/dsa/qca/Kconfig goes here #- file drivers/net/dsa/sja1105/Kconfig goes here NET_DSA_QCA8K all=m NET_DSA_REALTEK_SMI all=m NET_DSA_SMSC_LAN9303_I2C all=m NET_DSA_SMSC_LAN9303_MDIO all=m +NET_DSA_VITESSE_VSC73XX_SPI all=m +NET_DSA_VITESSE_VSC73XX_PLATFORM all=m #- #- *** FILE: drivers/net/dsa/b53/Kconfig *** @@ -5096,6 +5114,11 @@ NET_DSA_MV88E6XXX_PTP all=y #- NET_DSA_MSCC_FELIX all=m +#- +#- *** FILE: drivers/net/dsa/qca/Kconfig *** +#- +NET_DSA_AR9331 all=m + #- #- *** FILE: drivers/net/dsa/sja1105/Kconfig *** #- @@ -5948,6 +5971,7 @@ BCM63XX_PHY all=m BCM7XXX_PHY all=m BCM87XX_PHY all=m BROADCOM_PHY all=m +BCM84881_PHY all=y CICADA_PHY all=m CORTINA_PHY all=m DAVICOM_PHY all=m @@ -6154,6 +6178,7 @@ ATH_DEBUG all=n #- file drivers/net/wireless/ath/wil6210/Kconfig goes here #- file drivers/net/wireless/ath/ath10k/Kconfig goes here #- file drivers/net/wireless/ath/wcn36xx/Kconfig goes here +#- file drivers/net/wireless/ath/ath11k/Kconfig goes here #- #- *** FILE: drivers/net/wireless/ath/ar5523/Kconfig *** @@ -6753,6 +6778,7 @@ NVME_TARGET_TCP all=m #- NVMEM all=y NVMEM_SYSFS all=y +NVMEM_SPMI_SDAM all=m RAVE_SP_EEPROM all=m #- @@ -6903,12 +6929,18 @@ GENERIC_PHY all=y #- file drivers/phy/st/Kconfig goes here #- file drivers/phy/tegra/Kconfig goes here #- file drivers/phy/ti/Kconfig goes here +#- file drivers/phy/intel/Kconfig goes here #- #- *** FILE: drivers/phy/broadcom/Kconfig *** #- BCM_KONA_USB2_PHY all=m +#- +#- *** FILE: drivers/phy/intel/Kconfig *** +#- +PHY_INTEL_EMMC all=m + #- #- *** FILE: drivers/phy/marvell/Kconfig *** #- @@ -6979,6 +7011,7 @@ PINCTRL_MCP23S08 all=m #- PINCTRL_BAYTRAIL all=y PINCTRL_CHERRYVIEW all=m +PINCTRL_LYNXPOINT all=m PINCTRL_BROXTON all=m PINCTRL_CANNONLAKE all=m PINCTRL_CEDARFORK all=m @@ -7123,6 +7156,7 @@ I2C_MULTI_INSTANTIATE all=m INTEL_ATOMISP2_PM all=m HUAWEI_WMI all=m PCENGINES_APU2 all=m +INTEL_UNCORE_FREQ_CONTROL all=m #- file drivers/platform/x86/intel_speed_select_if/Kconfig goes here SYSTEM76_ACPI all=m @@ -7161,6 +7195,7 @@ PNPBIOS_PROC_FS i386=y #- *** FILE: drivers/power/avs/Kconfig *** #- POWER_AVS all=y +QCOM_CPR all=m #- #- *** FILE: drivers/power/reset/Kconfig *** @@ -7349,6 +7384,7 @@ REGULATOR_MAX8973 all=m REGULATOR_MAX77693 all=m REGULATOR_MC13783 all=m REGULATOR_MC13892 all=m +REGULATOR_MP8859 all=m REGULATOR_MT6311 all=m REGULATOR_MT6323 all=m REGULATOR_MT6397 all=m @@ -7390,6 +7426,7 @@ REMOTEPROC all=y #- *** FILE: drivers/reset/Kconfig *** #- RESET_CONTROLLER all=y +RESET_BRCMSTB_RESCAL all=y RESET_TI_SYSCON all=m #- file drivers/reset/sti/Kconfig goes here #- file drivers/reset/hisilicon/Kconfig goes here @@ -7850,6 +7887,7 @@ ZX2967_PM_DOMAINS all=y SOUNDWIRE all=y #- SoundWire Devices SOUNDWIRE_INTEL all=m +SOUNDWIRE_QCOM all=m #- #- *** FILE: drivers/spi/Kconfig *** @@ -7918,8 +7956,6 @@ STAGING all=y #- file drivers/staging/rtl8712/Kconfig goes here #- file drivers/staging/rtl8188eu/Kconfig goes here #- file drivers/staging/rts5208/Kconfig goes here -#- file drivers/staging/octeon/Kconfig goes here -#- file drivers/staging/octeon-usb/Kconfig goes here #- file drivers/staging/vt6655/Kconfig goes here #- file drivers/staging/vt6656/Kconfig goes here #- file drivers/staging/iio/Kconfig goes here @@ -7955,7 +7991,6 @@ STAGING all=y #- file drivers/staging/axis-fifo/Kconfig goes here #- file drivers/staging/fieldbus/Kconfig goes here #- file drivers/staging/kpc2000/Kconfig goes here -#- file drivers/staging/isdn/Kconfig goes here #- file drivers/staging/wusbcore/Kconfig goes here #- file drivers/staging/uwb/Kconfig goes here #- file drivers/staging/exfat/Kconfig goes here @@ -8101,13 +8136,13 @@ COMEDI_NI_TIO all=m #- #- *** FILE: drivers/staging/exfat/Kconfig *** #- -EXFAT_FS all=m -EXFAT_DISCARD all=y -EXFAT_DELAYED_SYNC all=n -EXFAT_KERNEL_DEBUG all=n -EXFAT_DEBUG_MSG all=n -EXFAT_DEFAULT_CODEPAGE all=437 -EXFAT_DEFAULT_IOCHARSET all="utf8" +STAGING_EXFAT_FS all=m +STAGING_EXFAT_DISCARD all=y +STAGING_EXFAT_DELAYED_SYNC all=y +STAGING_EXFAT_KERNEL_DEBUG all=n +STAGING_EXFAT_DEBUG_MSG all=n +STAGING_EXFAT_DEFAULT_CODEPAGE all=437 +STAGING_EXFAT_DEFAULT_IOCHARSET all="utf8" #- #- *** FILE: drivers/staging/fbtft/Kconfig *** @@ -8257,35 +8292,6 @@ ADE7854_SPI all=m #- AD2S1210 all=m -#- -#- *** FILE: drivers/staging/isdn/avm/Kconfig *** -#- -CAPI_AVM all=y -ISDN_DRV_AVMB1_B1ISA alpha=m i386=m -ISDN_DRV_AVMB1_B1PCI all=m sparc=n -ISDN_DRV_AVMB1_B1PCIV4 all=y -ISDN_DRV_AVMB1_T1ISA alpha=m i386=m -ISDN_DRV_AVMB1_B1PCMCIA all=m -ISDN_DRV_AVMB1_AVM_CS all=m -ISDN_DRV_AVMB1_T1PCI all=m sparc=n -ISDN_DRV_AVMB1_C4 all=m sparc=n - -#- -#- *** FILE: drivers/staging/isdn/gigaset/Kconfig *** -#- -ISDN_DRV_GIGASET all=m -GIGASET_CAPI all=y -GIGASET_BASE all=m -GIGASET_M105 all=m -GIGASET_M101 all=m -GIGASET_DEBUG all=n - -#- -#- *** FILE: drivers/staging/isdn/hysdn/Kconfig *** -#- -HYSDN all=m -HYSDN_CAPI all=y - #- #- *** FILE: drivers/staging/kpc2000/Kconfig *** #- @@ -8309,6 +8315,8 @@ STAGING_MEDIA all=y #- file drivers/staging/media/tegra-vde/Kconfig goes here #- file drivers/staging/media/ipu3/Kconfig goes here #- file drivers/staging/media/soc_camera/Kconfig goes here +#- file drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig goes here +#- file drivers/staging/media/rkisp1/Kconfig goes here #- #- *** FILE: drivers/staging/media/ipu3/Kconfig *** @@ -8565,6 +8573,18 @@ SBP_TARGET all=m #- TCM_FC all=m +#- +#- *** FILE: drivers/tee/Kconfig *** +#- +TEE all=m +#- file drivers/tee/optee/Kconfig goes here +#- file drivers/tee/amdtee/Kconfig goes here + +#- +#- *** FILE: drivers/tee/amdtee/Kconfig *** +#- +AMDTEE all=m + #- #- *** FILE: drivers/thermal/Kconfig *** #- @@ -8613,7 +8633,7 @@ INT3406_THERMAL all=m #- #- *** FILE: drivers/thunderbolt/Kconfig *** #- -THUNDERBOLT all=m +USB4 all=m #- #- *** FILE: drivers/tty/Kconfig *** @@ -8667,6 +8687,7 @@ SERIAL_DEV_BUS all=m SERIAL_8250 all=y SERIAL_8250_DEPRECATED_OPTIONS all=y SERIAL_8250_PNP all=y +SERIAL_8250_16550A_VARIANTS all=y SERIAL_8250_FINTEK all=y SERIAL_8250_CONSOLE all=y SERIAL_8250_PCI all=y @@ -9712,6 +9733,7 @@ FS_MBCACHE all=m #- file fs/btrfs/Kconfig goes here #- file fs/nilfs2/Kconfig goes here #- file fs/f2fs/Kconfig goes here +#- file fs/zonefs/Kconfig goes here FS_DAX all=y FS_POSIX_ACL all=y FILE_LOCKING all=y @@ -9763,6 +9785,7 @@ MISC_FILESYSTEMS all=y #- file fs/sysv/Kconfig goes here #- file fs/ufs/Kconfig goes here #- file fs/erofs/Kconfig goes here +#- file fs/vboxsf/Kconfig goes here #- file fs/aufs/Kconfig goes here NETWORK_FILESYSTEMS all=y #- file fs/nfs/Kconfig goes here @@ -9963,6 +9986,9 @@ F2FS_FS_SECURITY all=y F2FS_CHECK_FS all=y F2FS_IO_TRACE all=y F2FS_FAULT_INJECTION all=n +F2FS_FS_COMPRESSION all=y +F2FS_FS_LZO all=y +F2FS_FS_LZ4 all=y #- #- *** FILE: fs/fat/Kconfig *** @@ -10076,6 +10102,7 @@ NFS_SWAP all=y NFS_V4_1 all=n NFS_FSCACHE all=y NFS_USE_LEGACY_DNS all=n +NFS_DISABLE_UDP_SUPPORT all=y #- #- *** FILE: fs/nfsd/Kconfig *** @@ -10331,6 +10358,11 @@ UFS_DEBUG all=n UNICODE all=y UNICODE_NORMALIZATION_SELFTEST all=m +#- +#- *** FILE: fs/vboxsf/Kconfig *** +#- +VBOXSF_FS all=m + #- #- *** FILE: fs/verity/Kconfig *** #- @@ -10350,6 +10382,11 @@ XFS_ONLINE_REPAIR all=y XFS_WARN all=n XFS_DEBUG all=n +#- +#- *** FILE: fs/zonefs/Kconfig *** +#- +ZONEFS_FS all=m + #- #- *** FILE: init/Kconfig *** #- @@ -10427,6 +10464,7 @@ CGROUP_BPF all=y CGROUP_DEBUG all=n NAMESPACES all=y UTS_NS all=y +TIME_NS all=y IPC_NS all=y USER_NS all=y PID_NS all=y @@ -10438,6 +10476,7 @@ SYSFS_DEPRECATED_V2 all=n RELAY all=y BLK_DEV_INITRD all=y #- file usr/Kconfig goes here +BOOT_CONFIG all=y CC_OPTIMIZE_FOR_PERFORMANCE all=y CC_OPTIMIZE_FOR_SIZE all=n SYSCTL all=y @@ -10609,12 +10648,17 @@ HIGH_RES_TIMERS all=y alpha= ia64= #- CONTEXT_SWITCH_TRACER all=y FTRACE all=y +BOOTTIME_TRACING all=n FUNCTION_TRACER all=y FUNCTION_GRAPH_TRACER all=y +DYNAMIC_FTRACE all=y +FUNCTION_PROFILER all=y +STACK_TRACER all=y PREEMPTIRQ_EVENTS all=n IRQSOFF_TRACER all=n SCHED_TRACER all=y HWLAT_TRACER all=n +MMIOTRACE x86=n ENABLE_DEFAULT_TRACERS all=n FTRACE_SYSCALLS all=y TRACER_SNAPSHOT all=y @@ -10623,24 +10667,21 @@ TRACE_BRANCH_PROFILING all=n BRANCH_PROFILE_NONE all=y PROFILE_ANNOTATED_BRANCHES all=n PROFILE_ALL_BRANCHES all=n -STACK_TRACER all=y BLK_DEV_IO_TRACE all=n KPROBE_EVENTS all=y KPROBE_EVENTS_ON_NOTRACE all=n UPROBE_EVENTS all=y -DYNAMIC_FTRACE all=y -FUNCTION_PROFILER all=y BPF_KPROBE_OVERRIDE all=y FTRACE_MCOUNT_RECORD all=y -FTRACE_STARTUP_TEST all=n -MMIOTRACE x86=n HIST_TRIGGERS all=n TRACE_EVENT_INJECT all=n TRACEPOINT_BENCHMARK all=n RING_BUFFER_BENCHMARK all=m +TRACE_EVAL_MAP_FILE all=n +FTRACE_STARTUP_TEST all=n RING_BUFFER_STARTUP_TEST all=n PREEMPTIRQ_DELAY_TEST all=m -TRACE_EVAL_MAP_FILE all=n +KPROBE_EVENT_GEN_TEST all=m #- #- *** FILE: lib/Kconfig *** @@ -10958,6 +10999,7 @@ PAGE_OWNER all=n PAGE_POISONING all=n DEBUG_PAGE_REF all=n DEBUG_RODATA_TEST all=n +PTDUMP_DEBUGFS all=n #- #- *** FILE: net/6lowpan/Kconfig *** @@ -11010,6 +11052,7 @@ INET all=y #- file net/ipv4/Kconfig goes here #- file net/ipv6/Kconfig goes here #- file net/netlabel/Kconfig goes here +#- file net/mptcp/Kconfig goes here NETWORK_SECMARK all=y NETWORK_PHY_TIMESTAMPING all=n NETFILTER all=y @@ -11082,6 +11125,7 @@ LWTUNNEL_BPF all=y DST_CACHE all=y NET_DEVLINK all=y FAILOVER all=m +ETHTOOL_NETLINK all=y #- #- *** FILE: net/atm/Kconfig *** @@ -11274,6 +11318,7 @@ DNS_RESOLVER all=m #- NET_DSA all=m NET_DSA_TAG_8021Q all=m +NET_DSA_TAG_AR9331 all=m NET_DSA_TAG_KSZ all=m NET_DSA_TAG_OCELOT all=m NET_DSA_TAG_SJA1105 all=m @@ -11330,6 +11375,7 @@ NET_FOU_IP_TUNNELS all=y INET_AH all=m INET_ESP all=m INET_ESP_OFFLOAD all=m +INET_ESPINTCP all=y INET_IPCOMP all=m INET_XFRM_TUNNEL all=m INET_TUNNEL all=m @@ -11518,6 +11564,13 @@ NET_MPLS_GSO all=m MPLS_ROUTING all=m MPLS_IPTUNNEL all=m +#- +#- *** FILE: net/mptcp/Kconfig *** +#- +MPTCP all=y +MPTCP_IPV6 all=y +MPTCP_HMAC_TEST all=n + #- #- *** FILE: net/ncsi/Kconfig *** #- @@ -11848,8 +11901,10 @@ NET_SCH_CAKE all=m NET_SCH_FQ all=m NET_SCH_HHF all=m NET_SCH_PIE all=m +NET_SCH_FQ_PIE all=m NET_SCH_INGRESS all=m NET_SCH_PLUG all=m +NET_SCH_ETS all=m NET_SCH_DEFAULT all=y DEFAULT_FQ all=n DEFAULT_CODEL all=n @@ -11967,6 +12022,7 @@ UNIX_DIAG all=m #- VSOCKETS all=m VSOCKETS_DIAG all=m +VSOCKETS_LOOPBACK all=m VMWARE_VMCI_VSOCKETS all=m VIRTIO_VSOCKETS all=m HYPERV_VSOCKETS all=m @@ -12151,6 +12207,8 @@ SECURITY_SELINUX_DISABLE all=n SECURITY_SELINUX_DEVELOP all=y SECURITY_SELINUX_AVC_STATS all=n SECURITY_SELINUX_CHECKREQPROT_VALUE all=1 +SECURITY_SELINUX_SIDTAB_HASH_BITS all=9 +SECURITY_SELINUX_SID2STR_CACHE_SIZE all=256 #- #- *** FILE: security/smack/Kconfig *** @@ -12610,11 +12668,15 @@ SND_SOC_PCM3168A_SPI all=m SND_SOC_PCM512x_I2C all=m SND_SOC_PCM512x_SPI all=m SND_SOC_RK3328 all=m +SND_SOC_RT1308_SDW all=m SND_SOC_RT5616 all=m SND_SOC_RT5631 all=m SND_SOC_RT5670 all=m SND_SOC_RT5677 all=m SND_SOC_RT5677_SPI all=m +SND_SOC_RT700_SDW all=m +SND_SOC_RT711_SDW all=m +SND_SOC_RT715_SDW all=m SND_SOC_SGTL5000 all=m SND_SOC_SIMPLE_AMPLIFIER all=m SND_SOC_SIRF_AUDIO_CODEC all=m @@ -12647,6 +12709,7 @@ SND_SOC_TSCS42XX all=m SND_SOC_TSCS454 all=m SND_SOC_UDA1334 all=m SND_SOC_WCD9335 all=m +SND_SOC_WCD934X all=m SND_SOC_WM1250_EV1 all=m SND_SOC_WM8510 all=m SND_SOC_WM8523 all=m @@ -12673,11 +12736,13 @@ SND_SOC_WM8974 all=m SND_SOC_WM8978 all=m SND_SOC_WM8985 all=m SND_SOC_WM8991 all=m +SND_SOC_WSA881X all=m SND_SOC_ZX_AUD96P22 all=m SND_SOC_LM4857 all=m SND_SOC_MAX9759 all=m SND_SOC_MT6351 all=m SND_SOC_MT6358 all=m +SND_SOC_MT6660 all=m SND_SOC_NAU8540 all=m SND_SOC_NAU8810 all=m SND_SOC_NAU8822 all=m @@ -12752,7 +12817,9 @@ SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC all=y #- #- *** FILE: sound/soc/intel/boards/Kconfig *** #- +SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES all=y SND_SOC_INTEL_HASWELL_MACH all=m +SND_SOC_INTEL_BDW_RT5650_MACH all=m SND_SOC_INTEL_BDW_RT5677_MACH all=m SND_SOC_INTEL_BROADWELL_MACH all=m SND_SOC_INTEL_BYT_MAX98090_MACH all=m @@ -12783,6 +12850,7 @@ SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH all=m SND_SOC_INTEL_SOF_RT5682_MACH all=m SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH all=m SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH all=m +SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH all=m #- #- *** FILE: sound/soc/mediatek/Kconfig *** @@ -12924,6 +12992,7 @@ BACKLIGHT_PM8941_WLED all=m BLK_DEV_SGIIOC4 ia64=m BLK_WBT_SQ all=y BT_WILINK all=m +CAPI_AVM all=y CAPI_EICON all=y CFQ_GROUP_IOSCHED all=y CHARGER_LTC3651 all=m @@ -12952,6 +13021,10 @@ DEFAULT_IOSCHED all="cfq" DEFAULT_NOOP all=n DEFAULT_SECURITY all="" DEVICE_PUBLIC all=y +DRM_AMD_DC_DCN1_0 all=y +DRM_AMD_DC_DCN2_0 all=y +DRM_AMD_DC_DCN2_1 all=y +DRM_AMD_DC_DSC_SUPPORT all=y DRM_TINYDRM all=m DSCC4 all=m sparc=n EARLY_PRINTK_EFI all=n @@ -12961,7 +13034,14 @@ EROFS_FS_USE_VM_MAP_RAM all=y EROFS_FS_ZIP_CACHE_BIPOLAR all=y EROFS_FS_ZIP_CACHE_UNIPOLAR all=n EROFS_FS_ZIP_NO_CACHE all=n +EXFAT_DEBUG_MSG all=n +EXFAT_DEFAULT_CODEPAGE all=437 +EXFAT_DEFAULT_IOCHARSET all="utf8" +EXFAT_DELAYED_SYNC all=n +EXFAT_DISCARD all=y EXFAT_DONT_MOUNT_VFAT all=y +EXFAT_FS all=m +EXFAT_KERNEL_DEBUG all=n EXOFS_DEBUG all=n EXOFS_FS all=m EXT4_ENCRYPTION all=y @@ -12974,10 +13054,19 @@ FMC_CHARDEV all=m FMC_FAKEDEV all=m FMC_TRIVIAL all=m FMC_WRITE_EEPROM all=m +GIGASET_BASE all=m +GIGASET_CAPI all=y +GIGASET_DEBUG all=n +GIGASET_M101 all=m +GIGASET_M105 all=m +GPIO_LYNXPOINT all=y HEADERS_CHECK all=y HEADER_TEST all=n HOTPLUG_PCI_SGI ia64=m +HYSDN all=m +HYSDN_CAPI all=y I2C_BCM2048 all=m +I2C_PARPORT_LIGHT all=m INET6_XFRM_MODE_BEET all=m INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m INET6_XFRM_MODE_TRANSPORT all=m @@ -12995,7 +13084,9 @@ IOSCHED_DEADLINE all=y IOSCHED_NOOP all=y IPPP_FILTER all=y ISDN_AUDIO all=y +ISDN_CAPI_CAPI20 all=m ISDN_CAPI_CAPIDRV all=m +ISDN_CAPI_CAPIDRV_VERBOSE all=y ISDN_DIVAS all=m sparc=n ISDN_DIVAS_BRIPCI all=y ISDN_DIVAS_DIVACAPI all=m @@ -13003,6 +13094,15 @@ ISDN_DIVAS_MAINT all=m ISDN_DIVAS_PRIPCI all=y ISDN_DIVAS_USERIDI all=m ISDN_DIVERSION all=m +ISDN_DRV_AVMB1_AVM_CS all=m +ISDN_DRV_AVMB1_B1ISA alpha=m i386=m +ISDN_DRV_AVMB1_B1PCI all=m sparc=n +ISDN_DRV_AVMB1_B1PCIV4 all=y +ISDN_DRV_AVMB1_B1PCMCIA all=m +ISDN_DRV_AVMB1_C4 all=m sparc=n +ISDN_DRV_AVMB1_T1ISA alpha=m i386=m +ISDN_DRV_AVMB1_T1PCI all=m sparc=n +ISDN_DRV_GIGASET all=m ISDN_DRV_HISAX all=n ISDN_DRV_LOOP all=m ISDN_I4L all=m @@ -13077,6 +13177,8 @@ SOC_CAMERA_OV9640 all=m SOC_CAMERA_PLATFORM all=m SOC_CAMERA_RJ54N1 all=m SOC_CAMERA_TW9910 all=m +THUNDERBOLT all=m +THUNDERBOLT_NET all=m TI_CPSW_ALE all=m TOUCHSCREEN_W90X900 all=m TRACING_EVENTS_GPIO all=y @@ -13092,4 +13194,5 @@ VIDEO_ZORAN_DC30 all=m VIDEO_ZORAN_LML33 all=m VIDEO_ZORAN_LML33R10 all=m VIDEO_ZORAN_ZR36060 all=m +VIRTIO_BLK_SCSI all=y XEN_SELFBALLOONING all=y diff --git a/kernel.spec b/kernel.spec index 06251ae3..20e99330 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,8 +68,8 @@ %endif %define rel 1 -%define basever 5.5 -%define postver .13 +%define basever 5.6 +%define postver .0 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -120,7 +120,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: 0a78b1dc48dc032fe505b170c1b92339 +# Source0-md5: 7b9199ec5fa563ece9ed585ffb17798f %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz # Patch0-md5: 914bdb8d023b52168272723c9c8eb678 @@ -1276,8 +1276,6 @@ fi %if %{without rescuecd} %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko* -%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko* -%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko* %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko* %endif %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko* @@ -1357,8 +1355,6 @@ fi %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko* %if %{without rescuecd} /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko* -/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/avm_cs.ko* -/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko* /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko* %endif /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko* @@ -1480,6 +1476,7 @@ fi %{_kernelsrcdir}/arch/m68k/install.sh %{_kernelsrcdir}/arch/parisc/install.sh %{_kernelsrcdir}/arch/x86/ia32/[!M]* +%{_kernelsrcdir}/arch/powerpc/kexec %{_kernelsrcdir}/arch/powerpc/kvm %ifarch ppc ppc64 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.* diff --git a/linux-wistron-nx.patch b/linux-wistron-nx.patch index bbd6a923..84cb9368 100644 --- a/linux-wistron-nx.patch +++ b/linux-wistron-nx.patch @@ -24,8 +24,8 @@ } /* The Windows driver maps 0x10000 bytes, we keep only one page... */ bios_data_map_base = ioremap(0x400, 0xc00); ---- linux-5.4/arch/x86/mm/pageattr.c~ 2019-11-25 01:32:01.000000000 +0100 -+++ linux-5.4/arch/x86/mm/pageattr.c 2019-11-27 06:38:21.886578313 +0100 +--- linux-5.4/arch/x86/mm/pat/set_memory.c~ 2019-11-25 01:32:01.000000000 +0100 ++++ linux-5.4/arch/x86/mm/pat/set_memory.c 2019-11-27 06:38:21.886578313 +0100 @@ -1885,6 +1885,7 @@ int set_memory_x(unsigned long addr, int return change_page_attr_clear(&addr, numpages, __pgprot(_PAGE_NX), 0); -- 2.44.0