summaryrefslogtreecommitdiffstats
path: root/5.10.1-reverts.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-12-17 11:17:34 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-12-17 11:17:34 -0600
commit14694918cd7fac2032134b57250efa8c9ef9d830 (patch)
tree2d2179a4765022ff26c880defcd332d179e3ca48 /5.10.1-reverts.patch
parentb0f31387cd274ca7f3bbf68d10474b83131b0285 (diff)
downloadkernel-14694918cd7fac2032134b57250efa8c9ef9d830.tar.gz
kernel-14694918cd7fac2032134b57250efa8c9ef9d830.tar.xz
kernel-14694918cd7fac2032134b57250efa8c9ef9d830.zip
kernel-5.11.0-0.rc0.20201217gite994cc240a3b.102
* Thu Dec 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc0.20201217gite994cc240a3b.102] - build_configs.sh: Fix syntax flagged by shellcheck (Ben Crocker) - genspec.sh: Fix syntax flagged by shellcheck (Ben Crocker) - ark-rebase-patches.sh: Fix for shellcheck (Ben Crocker) - ark-create-release.sh: Fix syntax flagged by shellcheck (Ben Crocker) - merge-subtrees.sh: Fix syntax flagged by shellcheck (Ben Crocker) - rh-dist-git.sh: Fix syntax flagged by shellcheck (Ben Crocker) - update_scripts.sh: Fix syntax flagged by shellcheck (Ben Crocker) - x86_rngd.sh: Fix syntax flagged by shellcheck (Ben Crocker) - parallel_xz.sh: Fix syntax flagged by shellcheck (Ben Crocker) - expand_srpm.sh: Fix syntax flagged by shellcheck (Ben Crocker) - create-tarball.sh: Fix syntax flagged by shellcheck (Ben Crocker) - generate_bls_conf.sh: Fix syntax flagged by shellcheck (Ben Crocker) - clone_tree.sh: Fix syntax flagged by shellcheck (Ben Crocker) - new_release.sh: Fix syntax flagged by shellcheck (Ben Crocker) - download_cross.sh: Fix syntax flagged by shellcheck (Ben Crocker) - create_distgit_changelog.sh: Fix syntax flagged by shellcheck (Ben Crocker) - generate_cross_report.sh: Fix syntax flagged by shellcheck (Ben Crocker) - run_kabi-dw.sh: Fix syntax flagged by shellcheck (Ben Crocker) - mod-blacklist.sh: Fix syntax flagged by shellcheck (Ben Crocker) - scripts/configdiff.sh: Fix syntax flagged by shellcheck (Ben Crocker) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '5.10.1-reverts.patch')
-rw-r--r--5.10.1-reverts.patch84
1 files changed, 0 insertions, 84 deletions
diff --git a/5.10.1-reverts.patch b/5.10.1-reverts.patch
deleted file mode 100644
index 9527492ec..000000000
--- a/5.10.1-reverts.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 76f58e00133501dff1bd0c0f05d786e8fb01fcc8 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Mon, 14 Dec 2020 17:48:11 +0100
-Subject: Revert "md: change mddev 'chunk_sectors' from int to unsigned"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-This reverts commit 6ffeb1c3f8226244c08105bcdbeecc04bad6b89a.
-
-It causes problems :(
-
-Reported-by: Dave Jones <davej@codemonkey.org.uk>
-Reported-by: Mike Snitzer <snitzer@redhat.com>
-Cc: Song Liu <songliubraving@fb.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Linus Torvalds <torvalds@linux-foundation.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/md.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/md/md.h
-+++ b/drivers/md/md.h
-@@ -311,7 +311,7 @@ struct mddev {
- int external; /* metadata is
- * managed externally */
- char metadata_type[17]; /* externally set*/
-- unsigned int chunk_sectors;
-+ int chunk_sectors;
- time64_t ctime, utime;
- int level, layout;
- char clevel[16];
-@@ -339,7 +339,7 @@ struct mddev {
- */
- sector_t reshape_position;
- int delta_disks, new_level, new_layout;
-- unsigned int new_chunk_sectors;
-+ int new_chunk_sectors;
- int reshape_backwards;
-
- struct md_thread *thread; /* management thread */
-From ee1b46545ebbe1572ddddf70f4abe04070669bd0 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Mon, 14 Dec 2020 17:51:18 +0100
-Subject: Revert "dm raid: fix discard limits for raid1 and raid10"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-This reverts commit e0910c8e4f87bb9f767e61a778b0d9271c4dc512.
-
-It causes problems :(
-
-Reported-by: Dave Jones <davej@codemonkey.org.uk>
-Reported-by: Mike Snitzer <snitzer@redhat.com>
-Cc: Zdenek Kabelac <zkabelac@redhat.com>
-Cc: Mikulas Patocka <mpatocka@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-raid.c | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
---- a/drivers/md/dm-raid.c
-+++ b/drivers/md/dm-raid.c
-@@ -3730,14 +3730,12 @@ static void raid_io_hints(struct dm_targ
- blk_limits_io_opt(limits, chunk_size_bytes * mddev_data_stripes(rs));
-
- /*
-- * RAID10 personality requires bio splitting,
-- * RAID0/1/4/5/6 don't and process large discard bios properly.
-+ * RAID1 and RAID10 personalities require bio splitting,
-+ * RAID0/4/5/6 don't and process large discard bios properly.
- */
-- if (rs_is_raid10(rs)) {
-- limits->discard_granularity = max(chunk_size_bytes,
-- limits->discard_granularity);
-- limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors,
-- limits->max_discard_sectors);
-+ if (rs_is_raid1(rs) || rs_is_raid10(rs)) {
-+ limits->discard_granularity = chunk_size_bytes;
-+ limits->max_discard_sectors = rs->md.chunk_sectors;
- }
- }
-