commit cfa908e9d0de85569ad9746a6e67bdb0db8de1e4
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Wed Jul 25 00:32:16 2018 +0200
- 4.14.57
kernel-aufs4.patch | 8 ++++++--
kernel.spec | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ece8d2aa..c43fff82 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
%define rel 1
%define basever 4.14
-%define postver .55
+%define postver .57
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -122,7 +122,7 @@ Source0:
https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: bacdb9ffdcd922aa069a5e1520160e24
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 44835e3ff92f1cb0b63f93bcdb7a6362
+# Patch0-md5: 34afec0cac872e8c1d7e547fe81cd7f7
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index d11a0aa1..655a2be8 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -38376,7 +38376,7 @@ index d44de9d..095672b 100644
struct inode *inode;
int error;
-@@ -645,9 +655,16 @@ static int loop_change_fd(struct loop_device *lo, struct
block_device *bdev,
+@@ -645,13 +655,20 @@ static int loop_change_fd(struct loop_device *lo, struct
block_device *bdev,
file = fget(arg);
if (!file)
goto out;
@@ -38387,6 +38387,10 @@ index d44de9d..095672b 100644
+ get_file(file);
+ }
+ error = loop_validate_file(file, bdev);
+ if (error)
+ goto out_putf;
+
inode = file->f_mapping->host;
old_file = lo->lo_backing_file;
+ old_virt_file = lo->lo_backing_virt_file;
@@ -38422,7 +38426,7 @@ index d44de9d..095672b 100644
static int loop_set_fd(struct loop_device *lo, fmode_t mode,
struct block_device *bdev, unsigned int arg)
{
-- struct file *file, *f;
+- struct file *file;
+ struct file *file, *f, *virt_file = NULL;
struct inode *inode;
struct address_space *mapping;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/cfa908e9d0de85569ad9746a6e67bdb0db8de1e4
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
