Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.13.15-100.vanilla.knurd.1.fc25

22 files changed, 27 insertions, 96 deletions

diff --git a/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch b/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
deleted file mode 100644
index e8376331d..000000000
--- a/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0e9df6a74f9573409e5a2fbe29c1389188280bfc Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 5 Oct 2017 16:02:33 +0200
-Subject: [PATCH] platform/x86: peaq-wmi: Add DMI check before binding to the
- WMI interface
-
-It seems that the WMI GUID used by the PEAQ 2-in-1 WMI hotkeys is not
-as unique as a GUID should be and is used on some other devices too.
-
-This is causing spurious key-press reports on these other devices.
-
-This commits adds a DMI check to the PEAQ 2-in-1 WMI hotkeys driver to
-ensure that it is actually running on a PEAQ 2-in-1, fixing the
-spurious key-presses on these other devices.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1497861
-BugLink: https://bugzilla.suse.com/attachment.cgi?id=743182
-Cc: stable@vger.kernel.org
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/peaq-wmi.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c
-index bc98ef95514a..67fa3fa32011 100644
---- a/drivers/platform/x86/peaq-wmi.c
-+++ b/drivers/platform/x86/peaq-wmi.c
-@@ -8,6 +8,7 @@
-  */
- 
- #include <linux/acpi.h>
-+#include <linux/dmi.h>
- #include <linux/input-polldev.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -64,8 +65,22 @@ static void peaq_wmi_poll(struct input_polled_dev *dev)
- 	}
- }
- 
-+/* Some other devices (Shuttle XS35) use the same WMI GUID for other purposes */
-+static const struct dmi_system_id peaq_dmi_table[] = {
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
-+		},
-+	},
-+};
-+
- static int __init peaq_wmi_init(void)
- {
-+	/* WMI GUID is not unique, also check for a DMI match */
-+	if (!dmi_check_system(peaq_dmi_table))
-+		return -ENODEV;
-+
- 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
- 		return -ENODEV;
- 
-@@ -86,6 +101,9 @@ static int __init peaq_wmi_init(void)
- 
- static void __exit peaq_wmi_exit(void)
- {
-+	if (!dmi_check_system(peaq_dmi_table))
-+		return;
-+
- 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
- 		return;
- 
--- 
-2.14.2
-
diff --git a/baseconfig/CONFIG_SND_BCD2000 b/baseconfig/CONFIG_SND_BCD2000
index 0a60c490b..b56c9162f 100644
--- a/baseconfig/CONFIG_SND_BCD2000
+++ b/baseconfig/CONFIG_SND_BCD2000
@@ -1 +1 @@
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index fd815dfe4..4b405c6b8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5047,7 +5047,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 8b718270f..9678345b5 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5025,7 +5025,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index fca8a9142..072e60b7e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5434,7 +5434,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a863280bd..408c8c9f6 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5115,7 +5115,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ea09c1575..92c56a0ae 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5093,7 +5093,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b4f75a2c6..6149c6656 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5412,7 +5412,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 1e463a6c0..7625200db 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4762,7 +4762,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d46d9489e..22e22d7b4 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4783,7 +4783,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index aeca7e425..65ccd4ef0 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4783,7 +4783,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 45359f1fe..0d3f82aa3 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4762,7 +4762,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 0e29308fa..519ba7a12 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4607,7 +4607,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 1e4b8c99d..68439638d 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4584,7 +4584,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 0b80b7ac2..7806fa948 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4537,7 +4537,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 58fd15fb7..a86e4c977 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4514,7 +4514,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 087404e3f..4ecf3c971 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4436,7 +4436,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index be8c6aae8..29f7d53ec 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4413,7 +4413,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 890d25cfd..26b3adc8b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4825,7 +4825,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 71708573e..d8016bb78 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4804,7 +4804,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
diff --git a/kernel.spec b/kernel.spec
index bfe0d3fb5..b1f27b2be 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 %define stable_rc 0
 
 # Do we have a -stable update to apply?
-%define stable_update 14
+%define stable_update 15
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -693,10 +693,6 @@ Patch724: 1-3-net-set-tb--fast_sk_family.patch
 Patch725: 2-3-net-use-inet6_rcv_saddr-to-compare-sockets.patch
 Patch726: 3-3-inet-fix-improper-empty-comparison.patch
 
-
-# rhbz 1497861
-Patch629: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
-
 # rhbz 1482648
 Patch630: Input-synaptics---Disable-kernel-tracking-on-SMBus-devices.patch
 
@@ -2296,6 +2292,12 @@ fi
 #
 #
 %changelog
+* Tue Nov 21 2017 Jeremy Cline <jeremy@jcline.org> - 4.13.15-100
+- Linux v4.13.15
+
+* Mon Nov 20 2017 Laura Abbott <labbott@redhat.com>
+- Enable driver for the Behringer BCD 2000 (rhbz 1514945)
+
 * Sun Nov 19 2017 Jeremy Cline <jeremy@jcline.org> - 4.13.14-100
 - Linux v4.13.14
 
diff --git a/sources b/sources
index d7ff75a3a..b2d20930c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
-SHA512 (patch-4.13.14.xz) = 6cbcd43f1691be45f74a2d06ed55d59e4dc49c9a02d7573f3ca11130ad27a6f35f36d9da054e762ffbf9a5517735fba44bae601b60d477fcf5603a8867221c08
+SHA512 (patch-4.13.15.xz) = 54e1d3b526984efe90a5c759b35ac849ac65525c977b3982ef32b0fbb83e73f1fca92d73c3ffb1f23643d9f72a3083eeb4edb54768b105138722434811f622c4