commit a9ec5cdbb81ccfacf2a3c9d02dd7be1e03ddd720
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Fri Apr 7 13:06:26 2023 +0200
- 5.15.106
kernel-aufs5.patch | 6 +++---
kernel.spec | 4 ++--
update-source.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c99b5617..2b40b589 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 5.15
-%define postver .103
+%define postver .106
# 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: 0bb24b2d846841f711bee1dc09a1d724
+# Patch0-md5: 4e5070802c4b8224db1e9d10b16ffd92
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index da23015a..89f70d76 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -54,7 +54,7 @@ index 8cba10aafadb..7a9e40b97831 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -799,6 +799,24 @@ static int loop_change_fd(struct loop_device *lo, struct
block_device *bdev,
- return error;
+ goto done;
}
+/*
@@ -39477,14 +39477,14 @@ index 7a9e40b97831..5ed06240cc9c 100644
+ fput(old_virt_file);
if (partscan)
loop_reread_partitions(lo);
- return 0;
+
@@ -796,6 +817,8 @@ static int loop_change_fd(struct loop_device *lo, struct
block_device *bdev,
loop_global_unlock(lo, is_loop);
out_putf:
fput(file);
+ if (virt_file)
+ fput(virt_file);
- return error;
+ goto done;
}
@@ -1201,6 +1224,7 @@ static int loop_configure(struct loop_device *lo,
fmode_t mode,
diff --git a/update-source.sh b/update-source.sh
index 0caccf20..625ce1f7 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -2,7 +2,7 @@
set -xe
#BRANCH=aufs5.x-rcN
-BRANCH=aufs5.15.41
+BRANCH=aufs5.15
# aufs5
[ -d aufs5-standalone ] || git clone
https://github.com/sfjro/aufs5-standalone.git
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a9ec5cdbb81ccfacf2a3c9d02dd7be1e03ddd720
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
