[packages/kernel/LINUX_6_6] Up to 6.6.25
arekm
arekm at pld-linux.org
Mon Apr 8 15:34:15 CEST 2024
commit 3d4c0ae5209728a663968d27482a8b3979f6000c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Apr 8 14:51:01 2024 +0200
Up to 6.6.25
kernel-aufs.patch | 61 ++++++++++++++++++++++++++-----------------------------
kernel.spec | 4 ++--
2 files changed, 31 insertions(+), 34 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1e354fd8..db92f4d5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@
%define rel 1
%define basever 6.6
-%define postver .23
+%define postver .25
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -115,7 +115,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 452098d80ba925af3a4ab35998f3aef5
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 9f0b496cafec819580f5890bda60891e
+# Patch0-md5: 4db497b4bd0b3f99f81e0555e84733a8
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 00e4f39c..f96d06b1 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -199,19 +199,16 @@ 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 6c461573434d..7416cf375ad1 100644
+index 6c461573434d..f08de3775987 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
-@@ -99,4 +99,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
+@@ -99,4 +99,7 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
extern const struct pipe_buf_operations default_pipe_buf_ops;
+
+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags);
#endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e85b5ad3e206..db4297f60bd3 100644
@@ -2889,7 +2886,7 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2022-11-05 23:02:18.959222617 +0100
++++ linux/fs/aufs/branch.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -4743,7 +4740,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/cpup.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,1459 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6206,7 +6203,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/cpup.h 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,100 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -9121,7 +9118,7 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+};
diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
--- /usr/share/empty/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h 2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/dentry.h 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,270 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -9954,7 +9951,7 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
--- /usr/share/empty/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c 2023-10-31 09:31:04.196547417 +0100
++++ linux/fs/aufs/dir.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,765 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12324,7 +12321,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2022-11-05 23:02:18.962555950 +0100
++++ linux/fs/aufs/dynop.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,366 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12775,7 +12772,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2022-12-17 09:21:34.796521861 +0100
++++ linux/fs/aufs/export.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -14039,7 +14036,7 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/file.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,865 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -18260,7 +18257,7 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
+}
diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
--- /usr/share/empty/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c 2022-11-05 23:02:18.965889284 +0100
++++ linux/fs/aufs/hnotify.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,715 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19804,7 +19801,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/inode.h 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,707 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -21715,7 +21712,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,1516 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -23762,7 +23759,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
--- /usr/share/empty/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/i_op_ren.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,1260 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -26176,7 +26173,7 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#endif /* __AUFS_MODULE_H__ */
diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/mvdown.c 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -26886,7 +26883,7 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
--- /usr/share/empty/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/opts.c 2024-04-08 14:48:48.296574603 +0200
@@ -0,0 +1,1032 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -27561,8 +27558,8 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+ case Opt_prepend:
+ opt->add.bindex = 0;
+ fallthrough;
-+ add: /* indented label */
+ case Opt_add:
++ add: /* indented label */
+ err = au_br_add(sb, &opt->add,
+ au_ftest_opts(opts->flags, REMOUNT));
+ if (!err) {
@@ -27922,7 +27919,7 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/opts.h 2024-04-08 14:48:47.529907936 +0200
@@ -0,0 +1,263 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -29050,7 +29047,7 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/rdu.c 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,384 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -30722,7 +30719,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/super.h 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,592 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -32053,7 +32050,7 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2022-12-17 09:21:34.799855195 +0100
++++ linux/fs/aufs/vdir.c 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -32953,7 +32950,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/vfsub.c 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,918 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33875,7 +33872,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2023-10-31 09:31:04.199880750 +0100
++++ linux/fs/aufs/vfsub.h 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,403 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34282,7 +34279,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2022-11-05 23:02:18.969222617 +0100
++++ linux/fs/aufs/wbr_policy.c 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,830 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36659,7 +36656,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2022-11-05 23:02:18.972555950 +0100
++++ linux/fs/aufs/wkq.h 2024-04-08 14:48:47.533241270 +0200
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -36752,7 +36749,7 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
--- /usr/share/empty/fs/aufs/xattr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c 2023-10-31 09:31:04.203214083 +0100
++++ linux/fs/aufs/xattr.c 2024-04-08 14:48:48.296574603 +0200
@@ -0,0 +1,360 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -36836,7 +36833,7 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
+ if (is_acl) {
+ acl = vfs_get_acl(h_src_idmap, h_src_dentry, name);
+ AuDebugOn(!acl);
-+ if (unlikely(IS_ERR(acl))) {
++ if (IS_ERR(acl)) {
+ err = PTR_ERR(acl);
+ if (err == -ENODATA)
+ err = 0;
@@ -39046,7 +39043,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 2024-01-25 20:03:09.029873409 +0100
++++ linux/include/uapi/linux/aufs_type.h 2024-04-08 14:48:48.296574603 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39090,7 +39087,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "6.6-20231106"
++#define AUFS_VERSION "6.6-20240226"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/3d4c0ae5209728a663968d27482a8b3979f6000c
More information about the pld-cvs-commit
mailing list