commit 13f235e580afa1a1844887c485745375dbd53a02
Author: Jan Rękorajski <[email protected]>
Date: Sun May 2 11:02:18 2021 +0200
- started update to 5.12
kernel-aufs5.patch | 8 ++++----
kernel-small_fixes.patch | 8 --------
kernel.spec | 8 ++++----
3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1670d079..4c7198cb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
%define have_pcmcia 0
%endif
-%define rel 1
-%define basever 5.11
-%define postver .15
+%define rel 0.1
+%define basever 5.12
+%define postver .0
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -124,7 +124,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0:
https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: d2985a3f16ef1ea3405c04c406e29dcc
+# Source0-md5: 8c7420990de85f6754db287337da08b4
%if "%{postver}" != ".0"
Patch0:
https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
# Patch0-md5: 17988eec11ae720fcb70d03746531b84
diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 40fe567a..76f3cabe 100644
--- a/kernel-aufs5.patch
+++ b/kernel-aufs5.patch
@@ -47,7 +47,7 @@ index bfc1b86e3e733..cf773a5624338 100644
+F: include/uapi/linux/aufs_type.h
+
AUXILIARY DISPLAY DRIVERS
- M: Miguel Ojeda Sandonis <[email protected]>
+ M: Miguel Ojeda <[email protected]>
S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index e5ff328f09175..39d539df0349d 100644
@@ -169,8 +169,8 @@ index 866d5c2367b23..55b5356262085 100644
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags)
{
+ unsigned int p_space;
int ret;
-
diff --git a/fs/sync.c b/fs/sync.c
index 1373a610dc784..b7b5a0a0df6ff 100644
--- a/fs/sync.c
@@ -764,7 +764,7 @@ index e4a25c3fa9e55..497326faa1247 100644
+EXPORT_SYMBOL_GPL(update_time);
/**
- * touch_atime - update the access time
+ * atime_needs_update - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index 3e16fc64df8b8..eed3453ec40a8 100644
--- a/fs/namespace.c
@@ -39099,7 +39099,7 @@ index 39d539df0349d..4109efe2f6a3a 100644
loop_reread_partitions(lo, bdev);
return 0;
@@ -758,6 +778,8 @@ static int loop_change_fd(struct loop_device *lo, struct
block_device *bdev,
- mutex_unlock(&loop_ctl_mutex);
+ mutex_unlock(&lo->lo_mutex);
if (file)
fput(file);
+ if (virt_file)
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index f0584fb5..dc2c31ff 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -107,11 +107,3 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c
linux-5.3/drivers/scsi/aacra
if (dev->msi_enabled)
---- linux-5.7/scripts/ld-version.sh~ 2020-06-01 01:49:15.000000000 +0200
-+++ linux-5.7/scripts/ld-version.sh 2020-06-02 08:28:48.303207264 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/awk -f
-+#!/bin/awk -f
- # SPDX-License-Identifier: GPL-2.0
- # extract linker version number from stdin and turn into single number
- {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/13f235e580afa1a1844887c485745375dbd53a02
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
