commit 4df42b26697e51e7e3f59b5a02c239d94324d31f
Author: Jan Rękorajski <[email protected]>
Date: Fri May 13 17:14:03 2022 +0200
- 5.15.39
kernel-aufs5.patch | 37 ++-----------------------------------
kernel-layer7.patch | 2 +-
kernel-multiarch.config | 1 +
kernel.spec | 4 ++--
4 files changed, 6 insertions(+), 38 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a5a5f01a..79797611 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 5.15
-%define postver .32
+%define postver .39
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -121,7 +121,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
# Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5: 97e85dbe82cd7d4abd4107b9698c5fe2
+# Patch0-md5: 20b65f6a664201eb0c566e152d906018
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 7d8c6663..b9caca58 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -158,19 +158,6 @@ index 5dbce4dcc1a7d..3e6ba363b7775 100644
{
unsigned int p_space;
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 56eba723477e3..e60d8ad854004 100644
--- a/include/linux/fs.h
@@ -199,14 +186,6 @@ index 56eba723477e3..e60d8ad854004 100644
/* /sys/fs */
extern struct kobject *fs_kobj;
-@@ -2778,6 +2781,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 9fe165beb0f9e..e47f7e15eeaf7 100644
--- a/include/linux/lockdep.h
@@ -261,7 +240,7 @@ index d624231eab2bb..eff2ca26e6c58 100644
+++ b/kernel/locking/lockdep.c
@@ -189,7 +189,7 @@ static
struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
- static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
+ DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS);
-static inline struct lock_class *hlock_class(struct held_lock *hlock)
+inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -832,18 +811,6 @@ index 3e6ba363b7775..7c1be373eb7cd 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 5c8c5175b385c..ff7e9ff774b73 100644
--- a/fs/xattr.c
@@ -32696,7 +32663,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-layer7.patch b/kernel-layer7.patch
index fe1526c9..8795f11f 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -114,7 +114,7 @@ diff -urNp -x '*.orig'
linux-5.11/net/netfilter/nf_conntrack_standalone.c linux-
+ return -ENOSPC;
+#endif
+
- seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use));
+ seq_printf(s, "use=%u\n", refcount_read(&ct->ct_general.use));
if (seq_has_overflowed(s))
diff -urNp -x '*.orig' linux-5.11/net/netfilter/regexp/regexp.c
linux-5.11/net/netfilter/regexp/regexp.c
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index b4d3aa60..f22a3759 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -646,6 +646,7 @@ BCMA_DEBUG all=n
BLK_DEV all=y
#- file drivers/block/null_blk/Kconfig goes here
BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=y
MAC_FLOPPY ppc=m
PARIDE all=m
#- file drivers/block/paride/Kconfig goes here
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/4df42b26697e51e7e3f59b5a02c239d94324d31f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
