Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc4.git3.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc4.git3.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc4.git3.1.vanilla.knurd.1.fc29

21 files changed, 243 insertions, 3 deletions

diff --git a/0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch b/0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch
new file mode 100644
index 000000000..8c4f90c06
--- /dev/null
+++ b/0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch
@@ -0,0 +1,46 @@
+From 3b6df7e8130719b6bd83be241eb455f2aa862e9f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 14 Jun 2019 09:28:32 +0200
+Subject: [PATCH] HID: logitech-dj: Fix forwarding of very long HID++ reports
+
+The HID++ spec also defines very long HID++ reports, with a reportid of
+0x12. The MX5000 and MX5500 keyboards use 0x12 output reports for sending
+messages to display on their buildin LCD.
+
+Userspace (libmx5000) supports this, in order for this to work when talking
+to the HID devices instantiated for the keyboard by hid-logitech-dj,
+we need to properly forward these reports to the device.
+
+This commit fixes logi_dj_ll_raw_request not forwarding these reports.
+
+Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/hid/hid-logitech-dj.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
+index 865b179d0a62..aedbe18182db 100644
+--- a/drivers/hid/hid-logitech-dj.c
++++ b/drivers/hid/hid-logitech-dj.c
+@@ -30,6 +30,7 @@
+ 
+ #define REPORT_ID_HIDPP_SHORT			0x10
+ #define REPORT_ID_HIDPP_LONG			0x11
++#define REPORT_ID_HIDPP_VERY_LONG		0x12
+ 
+ #define HIDPP_REPORT_SHORT_LENGTH		7
+ #define HIDPP_REPORT_LONG_LENGTH		20
+@@ -1242,7 +1243,8 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,
+ 	int ret;
+ 
+ 	if ((buf[0] == REPORT_ID_HIDPP_SHORT) ||
+-	    (buf[0] == REPORT_ID_HIDPP_LONG)) {
++	    (buf[0] == REPORT_ID_HIDPP_LONG) ||
++	    (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) {
+ 		if (count < 2)
+ 			return -EINVAL;
+ 
+-- 
+2.21.0
+
diff --git a/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch b/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
new file mode 100644
index 000000000..d6195e56a
--- /dev/null
+++ b/0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
@@ -0,0 +1,106 @@
+From d004ab4e282082ddb645ff48d3f62a28fc5d69ef Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 15 May 2019 12:27:23 +0200
+Subject: [PATCH] platform/x86: asus-wmi: Only Tell EC the OS will handle
+ display hotkeys from asus_nb_wmi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will
+handle the display off hotkey") causes the backlight to be permanently off
+on various EeePC laptop models using the eeepc-wmi driver (Asus EeePC
+1015BX, Asus EeePC 1025C).
+
+The asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL) call added
+by that commit is made conditional in this commit and only enabled in
+the quirk_entry structs in the asus-nb-wmi driver fixing the broken
+display / backlight on various EeePC laptop models.
+
+Cc: João Paulo Rechi Vita <jprvita@endlessm.com>
+Fixes: 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey")
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/platform/x86/asus-nb-wmi.c | 8 ++++++++
+ drivers/platform/x86/asus-wmi.c    | 2 +-
+ drivers/platform/x86/asus-wmi.h    | 1 +
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
+index 81642102bf65..8d9e30dbb5af 100644
+--- a/drivers/platform/x86/asus-nb-wmi.c
++++ b/drivers/platform/x86/asus-nb-wmi.c
+@@ -65,10 +65,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,
+ 
+ static struct quirk_entry quirk_asus_unknown = {
+ 	.wapf = 0,
++	.wmi_backlight_set_devstate = true,
+ };
+ 
+ static struct quirk_entry quirk_asus_q500a = {
+ 	.i8042_filter = asus_q500a_i8042_filter,
++	.wmi_backlight_set_devstate = true,
+ };
+ 
+ /*
+@@ -79,26 +81,32 @@ static struct quirk_entry quirk_asus_q500a = {
+ static struct quirk_entry quirk_asus_x55u = {
+ 	.wapf = 4,
+ 	.wmi_backlight_power = true,
++	.wmi_backlight_set_devstate = true,
+ 	.no_display_toggle = true,
+ };
+ 
+ static struct quirk_entry quirk_asus_wapf4 = {
+ 	.wapf = 4,
++	.wmi_backlight_set_devstate = true,
+ };
+ 
+ static struct quirk_entry quirk_asus_x200ca = {
+ 	.wapf = 2,
++	.wmi_backlight_set_devstate = true,
+ };
+ 
+ static struct quirk_entry quirk_asus_ux303ub = {
+ 	.wmi_backlight_native = true,
++	.wmi_backlight_set_devstate = true,
+ };
+ 
+ static struct quirk_entry quirk_asus_x550lb = {
++	.wmi_backlight_set_devstate = true,
+ 	.xusb2pr = 0x01D9,
+ };
+ 
+ static struct quirk_entry quirk_asus_forceals = {
++	.wmi_backlight_set_devstate = true,
+ 	.wmi_force_als_set = true,
+ };
+ 
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 3e4336025e8f..9b18a184e0aa 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -2146,7 +2146,7 @@ static int asus_wmi_add(struct platform_device *pdev)
+ 		err = asus_wmi_backlight_init(asus);
+ 		if (err && err != -ENODEV)
+ 			goto fail_backlight;
+-	} else
++	} else if (asus->driver->quirks->wmi_backlight_set_devstate)
+ 		err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL);
+ 
+ 	if (asus_wmi_has_fnlock_key(asus)) {
+diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
+index 0930be770688..4f31b68642a0 100644
+--- a/drivers/platform/x86/asus-wmi.h
++++ b/drivers/platform/x86/asus-wmi.h
+@@ -31,6 +31,7 @@ struct quirk_entry {
+ 	bool store_backlight_power;
+ 	bool wmi_backlight_power;
+ 	bool wmi_backlight_native;
++	bool wmi_backlight_set_devstate;
+ 	bool wmi_force_als_set;
+ 	int wapf;
+ 	/*
+-- 
+2.21.0
+
diff --git a/Revert-Bluetooth-Align-minimum-encryption-key-size.patch b/Revert-Bluetooth-Align-minimum-encryption-key-size.patch
new file mode 100644
index 000000000..1318de32a
--- /dev/null
+++ b/Revert-Bluetooth-Align-minimum-encryption-key-size.patch
@@ -0,0 +1,54 @@
+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/configs/fedora/generic/CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT b/configs/fedora/generic/CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT
new file mode 100644
index 000000000..a6ada50c3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT
@@ -0,0 +1 @@
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
diff --git a/gitrev b/gitrev
index 1b6456d1e..ad6615e08 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-c11fb13a117e5a6736481c779cb971249ed96016
+72a20cee5d99d231809ee4d3d2c09a96a25451e2
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2bf1faceb..395594774 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5907,6 +5907,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2406f26ab..dcd01e6cf 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5885,6 +5885,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 8266866d2..ab5b4935a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6104,6 +6104,7 @@ CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 86af290a7..cda24c143 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5818,6 +5818,7 @@ CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index c5684a356..cee73bff9 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5797,6 +5797,7 @@ CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index c847d6f88..3d097951b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6083,6 +6083,7 @@ CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 2feadee65..21b6d14ec 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5419,6 +5419,7 @@ CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-i686.config b/kernel-i686.config
index b39a7e8a4..5f2165aff 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5398,6 +5398,7 @@ CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 9f3649b55..f96426265 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5059,6 +5059,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index bba4f2832..8f5ac62f8 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5036,6 +5036,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 04678e32d..6968894cc 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5004,6 +5004,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 278e9717b..3445f1ba9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4981,6 +4981,7 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_DEBUG is not set
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index efc9e3d7d..e6ea26c57 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5472,6 +5472,7 @@ CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 756cd7842..34d92dd7c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5451,6 +5451,7 @@ CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
 # CONFIG_SND_SOC_SOF_NOCODEC is not set
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
 CONFIG_SND_SOC_SOF_PCI=m
 # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
diff --git a/kernel.spec b/kernel.spec
index bc7403147..7343bb68d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -600,6 +600,15 @@ Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch
 # https://patchwork.kernel.org/patch/10817377/
 Patch532: usb-dwc2-Fix-DMA-cache-alignment-issues.patch
 
+# 1697069 LCD panel an Asus EeePC 1025C not lighting up, submitted upstream
+Patch533: 0001-platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
+
+# Fix for new Logitech wireless keyboard support in 5.2, submitted upstream
+Patch534: 0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch
+
+# Fix for broken bluetooth, reverted in upstream stable, not yet in Torvald's tree
+Patch535: Revert-Bluetooth-Align-minimum-encryption-key-size.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1841,6 +1850,16 @@ fi
 #
 #
 %changelog
+* Fri Jun 14 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc4.git3.1
+- Linux v5.2-rc4-129-g72a20cee5d99
+
+* Fri Jun 14 2019 Jeremy Cline <jcline@redhat.com>
+- Fix the long-standing bluetooth breakage
+
+* Fri Jun 14 2019 Hans de Goede <hdegoede@redhat.com>
+- Fix the LCD panel an Asus EeePC 1025C not lighting up (rhbz#1697069)
+- Add small bugfix for new Logitech wireless keyboard support
+
 * Thu Jun 13 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc4.git2.1
 - Linux v5.2-rc4-45-gc11fb13a117e
 
diff --git a/sources b/sources
index c9ce5c7df..a28d5291e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 SHA512 (patch-5.2-rc4.xz) = 75051f22668bcbfdafdf31c65e25d3b5647450c5b8a7bc64f2f081cb400728b0328df4dbb83f3c7de9cbabedf8064d9474643f1d703cdc1166b184611fdbd28c
-SHA512 (patch-5.2-rc4-git2.xz) = d1c3dec46de10c8cdbbe93681f0a37d33b477695b05dda3246e2cac76b0a14dd41947dde6dafa295f581e893a950d6aaae5356b07e8e418940bef3d3bcd7bd11
+SHA512 (patch-5.2-rc4-git3.xz) = 83ab7aabb425358558b354057444335e5896fb291d98351e6de04a0ec06647aee94d50a9c4c1952f77a0071b59aded2dc6e4ec48ad5a37a7a36a27d56de050c4