- started update to 5.12

diff --git a/kernel-aufs5.patch b/kernel-aufs5.patch
index 40fe567ac4f2b0ee0be5386906b758fe1f61fda4..76f3cabe66c55f46f801aeb89998cf7f22f45308 100644 (file)
--- 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 <miguel.ojeda.sandonis@gmail.com>
+ M:    Miguel Ojeda <ojeda@kernel.org>
  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 f0584fb5d2bf489cc24ac7eaf952c345766e3c27..dc2c31ff9b1c67f8176b7c034942e6a78f7a9b5b 100644 (file)
--- 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
-       {

diff --git a/kernel.spec b/kernel.spec
index 1670d0795583aa1e1f2e0b0dabeee1d047081267..4c7198cb55902d2bdc1571b04eef099d688ddd4c 100644 (file)
--- 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