[packages/kernel/LINUX_5_10] - 5.10.144
baggins
baggins at pld-linux.org
Fri Sep 23 09:58:13 CEST 2022
commit a51988f13707831b15854bf5095da7b0b86681a5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Sep 23 09:57:52 2022 +0200
- 5.10.144
kernel-aufs5.patch | 35 +----------------------------------
kernel-multiarch.config | 4 +++-
kernel.spec | 4 ++--
3 files changed, 6 insertions(+), 37 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b9959894..54413ae7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
%define rel 1
%define basever 5.10
-%define postver .138
+%define postver .144
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -127,7 +127,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
# Source0-md5: 753adc474bf799d569dec4f165ed92c3
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: 5406e053b8fe0916bd5dd9e9e17fb58d
+# Patch0-md5: c484f16ecc7a3e53bc117212265d747e
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 71c8a48b..0ef82f0c 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -158,19 +158,6 @@ index 866d5c2367b23..55b5356262085 100644
{
int ret;
-diff --git a/fs/sync.c b/fs/sync.c
-index 1373a610dc784..b7b5a0a0df6ff 100644
---- a/fs/sync.c
-+++ b/fs/sync.c
-@@ -28,7 +28,7 @@
- * wait == 1 case since in that case write_inode() functions do
- * sync_dirty_buffer() and thus effectively write one block at a time.
- */
--static int __sync_filesystem(struct super_block *sb, int wait)
-+int __sync_filesystem(struct super_block *sb, int wait)
- {
- if (wait)
- sync_inodes_sb(sb);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 42d246a942283..2cc1a02e444c4 100644
--- a/include/linux/fs.h
@@ -199,14 +186,6 @@ index 42d246a942283..2cc1a02e444c4 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2566,6 +2569,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
- }
-
- void emergency_thaw_all(void);
-+extern int __sync_filesystem(struct super_block *, int);
- extern int sync_filesystem(struct super_block *);
- 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 20b6797babe2c..7888c04c3ffaf 100644
--- a/include/linux/lockdep.h
@@ -833,18 +812,6 @@ index 55b5356262085..c13ac0fbac318 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/sync.c b/fs/sync.c
-index b7b5a0a0df6ff..fa5c7fba7f1ba 100644
---- a/fs/sync.c
-+++ b/fs/sync.c
-@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
- sb->s_op->sync_fs(sb, wait);
- return __sync_blockdev(sb->s_bdev, wait);
- }
-+EXPORT_SYMBOL_GPL(__sync_filesystem);
-
- /*
- * Write out and wait upon all dirty data associated with this
diff --git a/fs/xattr.c b/fs/xattr.c
index cd7a563e8bcd4..7d989d57b0f0d 100644
--- a/fs/xattr.c
@@ -32624,7 +32591,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+
+ lockdep_off();
+ down_read(&h_sb->s_umount);
-+ err = __sync_filesystem(h_sb, wait);
++ err = sync_filesystem(h_sb);
+ up_read(&h_sb->s_umount);
+ lockdep_on();
+
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 4940b057..fa1fef84 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -12521,7 +12521,9 @@ GCC_PLUGIN_STRUCTLEAK all=y
INIT_STACK_NONE all=n
GCC_PLUGIN_STRUCTLEAK_USER all=n
GCC_PLUGIN_STRUCTLEAK_BYREF all=n
-GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=y
+GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=n
+INIT_STACK_ALL_PATTERN all=n
+INIT_STACK_ALL_ZERO all=y
GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n
GCC_PLUGIN_STACKLEAK all=y
STACKLEAK_TRACK_MIN_SIZE all=100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a51988f13707831b15854bf5095da7b0b86681a5
More information about the pld-cvs-commit
mailing list