Linux v5.1.5

3 files changed, 6 insertions, 57 deletions

diff --git a/dm-make-sure-to-obey-max_io_len_target_boundary.patch b/dm-make-sure-to-obey-max_io_len_target_boundary.patch
deleted file mode 100644
index 3dd4d0e61..000000000
--- a/dm-make-sure-to-obey-max_io_len_target_boundary.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cddb054c69999d655502d7c97d0855ba7ede18ac Mon Sep 17 00:00:00 2001
-From: Michael Lass <bevan@bi-co.net>
-Date: Thu, 23 May 2019 21:07:13 +0200
-Subject: [PATCH] dm: make sure to obey max_io_len_target_boundary
-
-commit 51b86f9a8d1c4bb4e3862ee4b4c5f46072f7520d upstream.
-
-Commit 61697a6abd24 ("dm: eliminate 'split_discard_bios' flag from DM
-target interface") incorrectly removed code from
-__send_changing_extent_only() that is required to impose a per-target IO
-boundary on IO that exceeds max_io_len_target_boundary().  Otherwise
-"special" IO (e.g. DISCARD, WRITE SAME, WRITE ZEROES) can write beyond
-where allowed.
-
-Fix this by restoring the max_io_len_target_boundary() limit in
-__send_changing_extent_only()
-
-Fixes: 61697a6abd24 ("dm: eliminate 'split_discard_bios' flag from DM target interface")
-Cc: stable@vger.kernel.org # 5.1+
-Signed-off-by: Michael Lass <bevan@bi-co.net>
-Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index 043f0761e4a0..08e7d412af95 100644
---- a/drivers/md/dm.c
-+++ b/drivers/md/dm.c
-@@ -1467,7 +1467,7 @@ static unsigned get_num_write_zeroes_bios(struct dm_target *ti)
- static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti,
- 				       unsigned num_bios)
- {
--	unsigned len = ci->sector_count;
-+	unsigned len;
- 
- 	/*
- 	 * Even though the device advertised support for this type of
-@@ -1478,6 +1478,8 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *
- 	if (!num_bios)
- 		return -EOPNOTSUPP;
- 
-+	len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti));
-+
- 	__send_duplicate_bios(ci, ti, num_bios, &len);
- 
- 	ci->sector += len;
--- 
-2.21.0
-
diff --git a/kernel.spec b/kernel.spec
index 3b15e5686..7cfcc8f77 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 301
+%global baserelease 300
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -589,9 +589,6 @@ Patch526: 0001-platform-x86-ideapad-laptop-Remove-no_hw_rfkill_list.patch
 # https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/
 Patch527: Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pa.patch
 
-# Coming in v5.1.5
-Patch528: dm-make-sure-to-obey-max_io_len_target_boundary.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1830,6 +1827,9 @@ fi
 #
 #
 %changelog
+* Sat May 25 2019 Jeremy Cline <jcline@redhat.com> - 5.1.5-300
+- Linux v5.1.5
+
 * Fri May 24 2019 Jeremy Cline <jcline@redhat.com> - 5.1.4-301
 - Fix fstrim discarding too many blocks
 
diff --git a/sources b/sources
index a476a2c51..3f18e9008 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
-SHA512 (patch-5.1.4.xz) = 0206b5c977147a04331882c53533fb418669afc8c2b2ec0ba298d041e9bfafa8e93c6fff665676c4473dc408fcd8772fb7addd99967e0798496fdb6e019a025c
+SHA512 (patch-5.1.5.xz) = 793d61bbefe3587f95cf2b6eb56f3c60ef36512448ddcb1ab7c4fb614e14336e8d703f7cf188dfab46cb40d60511291b5163d2dae8c0bc950caeebd1e4e6c9c2