commit e4ab91f21fb87e8e7b71671a4b84bd5d79221687
Author: Jan Rękorajski <[email protected]>
Date: Sat Oct 26 23:56:53 2024 +0200
- 6.1.114
kernel-aufs.patch | 4 ++--
kernel-multiarch.config | 7 +++++--
kernel.spec | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e833027b..aa1a22b5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 6.1
-%define postver .107
+%define postver .114
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -121,7 +121,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 321b8ee7c71298e708418a0afb4d651e
+# Patch0-md5: f24a20ccc0f3e91db26dec60e6ce91a0
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index b1e64111..cfc953c0 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -720,8 +720,8 @@ index c980a0524118..40087d11a974 100644
}
+EXPORT_SYMBOL_GPL(setfl);
- static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
- int force)
+ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+ int force)
diff --git a/fs/file_table.c b/fs/file_table.c
index dd88701e54a9..ecdb7817b074 100644
--- a/fs/file_table.c
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 27fcf498..12c5bb9a 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -13430,10 +13430,10 @@ ZSWAP_COMPRESSOR_DEFAULT_LZ4 all=n
ZSWAP_COMPRESSOR_DEFAULT_LZ4HC all=n
ZSWAP_COMPRESSOR_DEFAULT_ZSTD all=n
ZSWAP_ZPOOL_DEFAULT_ZBUD all=y
-ZSWAP_ZPOOL_DEFAULT_Z3FOLD all=n
+ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED all=n
ZSWAP_ZPOOL_DEFAULT_ZSMALLOC all=n
ZBUD all=y
-Z3FOLD all=m
+Z3FOLD_DEPRECATED all=m
ZSMALLOC all=y
ZSMALLOC_STAT all=y
SLAB all=n
@@ -14623,6 +14623,9 @@ GCC_PLUGIN_LATENT_ENTROPY all=n
#-
#- file security/keys/Kconfig goes here
SECURITY_DMESG_RESTRICT all=y
+PROC_MEM_ALWAYS_FORCE all=y
+PROC_MEM_FORCE_PTRACE all=n
+PROC_MEM_NO_FORCE all=n
SECURITY all=y
SECURITYFS all=y
SECURITY_NETWORK all=y
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e4ab91f21fb87e8e7b71671a4b84bd5d79221687
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
