diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index 703ae579..0b704dd9 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,19 +1,20 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.2 Kernel Configuration +# Linux/x86_64 5.15.5 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 10.3.0" +CONFIG_CC_VERSION_TEXT="gcc (Pisi Linux) 11.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100300 +CONFIG_GCC_VERSION=110200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23601 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23601 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_IRQ_WORK=y @@ -5089,6 +5090,8 @@ CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m +CONFIG_SENSORS_ASUS_WMI=m +CONFIG_SENSORS_ASUS_WMI_EC=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set @@ -9685,6 +9688,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_FTRACE is not set CONFIG_PSTORE_RAM=m +# CONFIG_PSTORE_BLK is not set CONFIG_SYSV_FS=m CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set @@ -9924,6 +9928,8 @@ CONFIG_INIT_STACK_NONE=y # CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization # end of Kernel hardening options # end of Security options @@ -10382,6 +10388,8 @@ CONFIG_HAVE_ARCH_KGDB=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y +CONFIG_HAVE_KCSAN_COMPILER=y +# CONFIG_KCSAN is not set # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y diff --git a/kernel/kernel/files/patches/linux/patch-5.15.5.xz b/kernel/kernel/files/patches/linux/patch-5.15.5.xz new file mode 100644 index 00000000..2dab4c63 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-5.15.5.xz differ diff --git a/kernel/kernel/files/patches/mageia/fs-aufs5.15-symbol-exports.patch b/kernel/kernel/files/patches/mageia/fs-aufs5.15-symbol-exports.patch index 4f5b3d84..3a5387d5 100644 --- a/kernel/kernel/files/patches/mageia/fs-aufs5.15-symbol-exports.patch +++ b/kernel/kernel/files/patches/mageia/fs-aufs5.15-symbol-exports.patch @@ -3,7 +3,6 @@ fs/exec.c | 1 + fs/fcntl.c | 1 + fs/file_table.c | 2 ++ - fs/inode.c | 1 + fs/namespace.c | 3 +++ fs/notify/group.c | 1 + fs/open.c | 1 + @@ -14,7 +13,7 @@ kernel/locking/lockdep.c | 1 + kernel/task_work.c | 1 + security/security.c | 8 ++++++++ - 15 files changed, 28 insertions(+) + 14 files changed, 27 insertions(+) diff -Nurp linux-5.15.1-aufs/fs/dcache.c linux-5.15.1-aufs-mod/fs/dcache.c --- linux-5.15.1-aufs/fs/dcache.c 2021-11-08 23:01:48.275645778 +0200 @@ -76,17 +75,6 @@ diff -Nurp linux-5.15.1-aufs/fs/file_table.c linux-5.15.1-aufs-mod/fs/file_table void __init files_init(void) { -diff -Nurp linux-5.15.1-aufs/fs/inode.c linux-5.15.1-aufs-mod/fs/inode.c ---- linux-5.15.1-aufs/fs/inode.c 2021-11-08 23:01:48.275645778 +0200 -+++ linux-5.15.1-aufs-mod/fs/inode.c 2021-11-08 23:02:45.270309130 +0200 -@@ -1788,6 +1788,7 @@ int update_time(struct inode *inode, str - return inode->i_op->update_time(inode, time, flags); - return generic_update_time(inode, time, flags); - } -+EXPORT_SYMBOL_GPL(update_time); - - /** - * atime_needs_update - update the access time diff -Nurp linux-5.15.1-aufs/fs/namespace.c linux-5.15.1-aufs-mod/fs/namespace.c --- linux-5.15.1-aufs/fs/namespace.c 2021-11-08 23:01:48.276645825 +0200 +++ linux-5.15.1-aufs-mod/fs/namespace.c 2021-11-08 23:02:45.271309177 +0200 diff --git a/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch b/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch index 1e2dd6e0..eada6f7b 100644 --- a/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch +++ b/kernel/kernel/files/patches/mageia/fs-aufs5.15.patch @@ -32150,7 +32150,7 @@ index 000000000000..cc0d735c4c3a +static inline int vfsub_update_time(struct inode *h_inode, + struct timespec64 *ts, int flags) +{ -+ return update_time(h_inode, ts, flags); ++ return inode_update_time(h_inode, ts, flags); + /* no vfsub_update_h_iattr() since we don't have struct path */ +} + @@ -37007,19 +37007,6 @@ index 9c6c6a3e2de5..02382fa9bd34 100644 if (error) return error; -diff --git a/fs/inode.c b/fs/inode.c -index ed0cab8a32db..7e53985e62e5 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1782,7 +1782,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) - { - 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 659a8f39c61a..128367073782 100644 --- a/fs/namespace.c @@ -37168,14 +37155,6 @@ index e7a633353fd2..376ddf1965aa 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); -@@ -2613,6 +2615,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); -+extern int update_time(struct inode *, struct timespec64 *, int); - - /* /sys/fs */ - extern struct kobject *fs_kobj; @@ -2776,6 +2779,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) } diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index cdbdc4f8..41e0dbeb 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -33,7 +33,7 @@ - patches/linux/patch-5.15.3.xz + patches/linux/patch-5.15.5.xz patches/mageia/fs-aufs5.15.patch patches/mageia/fs-aufs5.15-symbol-exports.patch @@ -154,6 +154,17 @@ + + 2021-11-27 + 5.15.5 + Version bump. + security + + systemRestart + + Mustafa Cinasal + muscnsl@gmail.com + 2021-11-19 5.15.3