Linux v5.1.10

3 files changed, 5 insertions, 61 deletions

diff --git a/Revert-Bluetooth-Align-minimum-encryption-key-size.patch b/Revert-Bluetooth-Align-minimum-encryption-key-size.patch
deleted file mode 100644
index 1318de32a..000000000
--- a/Revert-Bluetooth-Align-minimum-encryption-key-size.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c8f57936ab21a1430ae2209fa874e842d13552d3 Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Tue, 11 Jun 2019 14:59:23 +0000
-Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE
- and BR/EDR connections"
-
-This reverts commit d5bb334a8e171b262e48f378bd2096c0ea458265.
-
-This patch broke a number of older bluetooth devices and while an RFC
-that fixes this patch has been posted upstream, it has not been merged
-and there are still a few folks reporting problems.
-
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
----
- include/net/bluetooth/hci_core.h | 3 ---
- net/bluetooth/hci_conn.c         | 8 --------
- 2 files changed, 11 deletions(-)
-
-diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
-index 05b1b96f4d9e..094e61e07030 100644
---- a/include/net/bluetooth/hci_core.h
-+++ b/include/net/bluetooth/hci_core.h
-@@ -190,9 +190,6 @@ struct adv_info {
- 
- #define HCI_MAX_SHORT_NAME_LENGTH	10
- 
--/* Min encryption key size to match with SMP */
--#define HCI_MIN_ENC_KEY_SIZE		7
--
- /* Default LE RPA expiry time, 15 minutes */
- #define HCI_DEFAULT_RPA_TIMEOUT		(15 * 60)
- 
-diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
-index 3cf0764d5793..bd4978ce8c45 100644
---- a/net/bluetooth/hci_conn.c
-+++ b/net/bluetooth/hci_conn.c
-@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
- 	    !test_bit(HCI_CONN_ENCRYPT, &conn->flags))
- 		return 0;
- 
--	/* The minimum encryption key size needs to be enforced by the
--	 * host stack before establishing any L2CAP connections. The
--	 * specification in theory allows a minimum of 1, but to align
--	 * BR/EDR and LE transports, a minimum of 7 is chosen.
--	 */
--	if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
--		return 0;
--
- 	return 1;
- }
- 
--- 
-2.21.0
-
diff --git a/kernel.spec b/kernel.spec
index 867426f07..f5852a7c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 9
+%define stable_update 10
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -585,11 +585,6 @@ Patch524: net-vhost_net-fix-possible-infinite-loop.patch
 # Fix wifi on various ideapad models not working (rhbz#1703338)
 Patch526: 0001-platform-x86-ideapad-laptop-Remove-no_hw_rfkill_list.patch
 
-# rhbz 1711468
-# https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/
-# https://lore.kernel.org/linux-bluetooth/af8cf6f4-4979-2f6f-68ed-e5b368b17ec7@redhat.com/
-Patch527: Revert-Bluetooth-Align-minimum-encryption-key-size.patch
-
 # CVE-2019-12378 rhbz 1715459 1715460
 Patch528: ipv6_sockglue-fix-missing-check-bug-in-ip6_ra_control.patch
 
@@ -1875,6 +1870,9 @@ fi
 #
 #
 %changelog
+* Mon Jun 17 2019 Jeremy Cline <jcline@redhat.com> - 5.1.10-300
+- Linux v5.1.10
+
 * Fri Jun 14 2019 Hans de Goede <hdegoede@redhat.com>
 - Fix the LCD panel an Asus EeePC 1025C not lighting up (rhbz#1697069)
 - Fix the LCD panel on the GPD MicroPC not working
diff --git a/sources b/sources
index 7ea3025ed..a377a511b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
-SHA512 (patch-5.1.9.xz) = 07fe43bdcb37f8f082cfeb19c3728fd0c5292d479793d02bad1386b2b3eb0618f1b4c95b17dba16eac19b1cdfd3d8aa9c235784d7abed2222b4dd14636756ec6
+SHA512 (patch-5.1.10.xz) = 6823419cadcfcea33b1454cfad71c43f94a896398d07f538ffbe14f6f49d018a8fb6adc80c3e5f572a9b5bcb8bd41f0c9cc9110056f6b4c17996f9d2503336cf