- 5.9.11

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index c2bc89ed3b7047e9f6433a749b5352b06bc11aeb..f0584fb5d2bf489cc24ac7eaf952c345766e3c27 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -115,81 +115,3 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra
  # SPDX-License-Identifier: GPL-2.0
  # extract linker version number from stdin and turn into single number
        {
-From eb8409071a1d47e3593cfe077107ac46853182ab Mon Sep 17 00:00:00 2001
-From: "Darrick J. Wong" <darrick.wong@oracle.com>
-Date: Thu, 19 Nov 2020 15:17:50 -0800
-Subject: xfs: revert "xfs: fix rmap key and record comparison functions"
-
-This reverts commit 6ff646b2ceb0eec916101877f38da0b73e3a5b7f.
-
-Your maintainer committed a major braino in the rmap code by adding the
-attr fork, bmbt, and unwritten extent usage bits into rmap record key
-comparisons.  While XFS uses the usage bits *in the rmap records* for
-cross-referencing metadata in xfs_scrub and xfs_repair, it only needs
-the owner and offset information to distinguish between reverse mappings
-of the same physical extent into the data fork of a file at multiple
-offsets.  The other bits are not important for key comparisons for index
-lookups, and never have been.
-
-Eric Sandeen reports that this causes regressions in generic/299, so
-undo this patch before it does more damage.
-
-Reported-by: Eric Sandeen <sandeen@sandeen.net>
-Fixes: 6ff646b2ceb0 ("xfs: fix rmap key and record comparison functions")
-Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-Reviewed-by: Eric Sandeen <sandeen@redhat.com>
----
- fs/xfs/libxfs/xfs_rmap_btree.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
-index 577a66381327c..beb81c84a9375 100644
---- a/fs/xfs/libxfs/xfs_rmap_btree.c
-+++ b/fs/xfs/libxfs/xfs_rmap_btree.c
-@@ -243,8 +243,8 @@ xfs_rmapbt_key_diff(
-       else if (y > x)
-               return -1;
- 
--      x = be64_to_cpu(kp->rm_offset);
--      y = xfs_rmap_irec_offset_pack(rec);
-+      x = XFS_RMAP_OFF(be64_to_cpu(kp->rm_offset));
-+      y = rec->rm_offset;
-       if (x > y)
-               return 1;
-       else if (y > x)
-@@ -275,8 +275,8 @@ xfs_rmapbt_diff_two_keys(
-       else if (y > x)
-               return -1;
- 
--      x = be64_to_cpu(kp1->rm_offset);
--      y = be64_to_cpu(kp2->rm_offset);
-+      x = XFS_RMAP_OFF(be64_to_cpu(kp1->rm_offset));
-+      y = XFS_RMAP_OFF(be64_to_cpu(kp2->rm_offset));
-       if (x > y)
-               return 1;
-       else if (y > x)
-@@ -390,8 +390,8 @@ xfs_rmapbt_keys_inorder(
-               return 1;
-       else if (a > b)
-               return 0;
--      a = be64_to_cpu(k1->rmap.rm_offset);
--      b = be64_to_cpu(k2->rmap.rm_offset);
-+      a = XFS_RMAP_OFF(be64_to_cpu(k1->rmap.rm_offset));
-+      b = XFS_RMAP_OFF(be64_to_cpu(k2->rmap.rm_offset));
-       if (a <= b)
-               return 1;
-       return 0;
-@@ -420,8 +420,8 @@ xfs_rmapbt_recs_inorder(
-               return 1;
-       else if (a > b)
-               return 0;
--      a = be64_to_cpu(r1->rmap.rm_offset);
--      b = be64_to_cpu(r2->rmap.rm_offset);
-+      a = XFS_RMAP_OFF(be64_to_cpu(r1->rmap.rm_offset));
-+      b = XFS_RMAP_OFF(be64_to_cpu(r2->rmap.rm_offset));
-       if (a <= b)
-               return 1;
-       return 0;
--- 
-cgit 1.2.3-1.el7
-

diff --git a/kernel.spec b/kernel.spec
index 9c33cc89827162c3c8bb414fdd5ccb0169418d79..f8f83b6bfca793037221da8201ec9267ce3fab11 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
+%define                rel             1
 %define                basever         5.9
-%define                postver         .10
+%define                postver         .11
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -127,7 +127,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 0959d759fd19e146367221aff504ad91
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  838d1a5a92ce56c37ea22ef9fa8390b7
+# Patch0-md5:  f400a38fe1f390748ac9d3a2b130858c
 %endif
 Source1:       kernel.sysconfig