commit b2709f0dbdf9fb49178f9b7cb54d8c290abd144f
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 28 00:19:50 2024 +0100
- 6.1.122
kernel-aufs.patch | 6 +++++-
kernel.spec | 4 ++--
update-source.sh | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3469820d..4d28240c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 6.1
-%define postver .119
+%define postver .122
# 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: 0da46585f753bc463d3b1b8cf39ad174
+# Patch0-md5: e5b7ade783c1eb56d89358e6c2f30253
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index 9a04e153..1c6b78c1 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -495,7 +495,7 @@ index 2def55555e05..fefc5c67e96e 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See
Documentation/mm/remap_file_pages.rst.\n",
current->comm, current->pid);
-@@ -2871,10 +2874,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long,
start, unsigned long, size,
+@@ -2871,14 +2874,38 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long,
start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
@@ -523,8 +523,12 @@ index 2def55555e05..fefc5c67e96e 100644
+ fput(prfile);
+#else
file = get_file(vma->vm_file);
+ ret = security_mmap_file(vma->vm_file, prot, flags);
+ if (ret)
+ goto out_fput;
ret = do_mmap(vma->vm_file, start, size,
prot, flags, pgoff, &populate, NULL);
+ out_fput:
fput(file);
+#endif /* CONFIG_AUFS_FS */
out:
diff --git a/update-source.sh b/update-source.sh
index dfc06261..ab9d9adc 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -2,7 +2,7 @@
set -xe
#BRANCH=aufs6.0
-BRANCH=aufs6.x-rcN
+BRANCH=aufs6.1
# aufs6
[ -d aufs-standalone ] || git clone
https://github.com/sfjro/aufs-standalone.git
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b2709f0dbdf9fb49178f9b7cb54d8c290abd144f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
