Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc7.git2.1.vanilla.knurd.1.fc29

4 files changed, 11 insertions, 35 deletions

diff --git a/gitrev b/gitrev
index b3552e082..29d173874 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-b04e217704b7f879c6b91222b066983a44a7a09f
+dd52cb879063ca5470d5a093c32180ba74fa528e
diff --git a/kernel.spec b/kernel.spec
index efac33206..c6420a5cd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -632,9 +632,6 @@ Patch501: Fix-for-module-sig-verification.patch
 # rhbz 1431375
 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 
-# rhbz 1509461
-Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
-
 # rbhz 1435837
 # https://www.spinics.net/lists/linux-acpi/msg82405.html
 Patch504: mailbox-ACPI-erroneous-error-message-when-parsing-ACPI.patch
@@ -1877,6 +1874,13 @@ fi
 #
 #
 %changelog
+* Thu May 31 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git2.1
+- Linux v4.17-rc7-43-gdd52cb879063
+
+* Wed May 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git1.1
+- Linux v4.17-rc7-31-g0044cdeb7313
+- Reenable debugging options.
+
 * Tue May 29 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc7.git0.1
 - Linux v4.17-rc7
 
diff --git a/sources b/sources
index b7150cc5e..fa28b9d41 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 SHA512 (patch-4.17-rc7.xz) = 1b6f4c32d9ca79ef1b140fff3a49b493e575f36a10098c40d76f7904abff71175eb0448bb46941631ddf4f879bd50f384e7373009ef563abf7e057483a7be36d
+SHA512 (patch-4.17-rc7-git2.xz) = ab1f6652eb86569917d1d5d75aa4684cae7f2ac209d9969c1a6aaf9441907441edc4152495bf2b6244daa174aa5b9d78c6eb6005e617dd12fba274c6a3095262
diff --git a/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch b/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
deleted file mode 100644
index a37b15ec7..000000000
--- a/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From patchwork Sun Nov  5 17:09:51 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v3,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI
-From: Yiannis Marangos <yiannis.marangos@gmail.com>
-X-Patchwork-Id: 10042387
-Message-Id: <20171105170951.20261-3-yiannis.marangos@gmail.com>
-To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com
-Cc: Yiannis Marangos <yiannis.marangos@gmail.com>
-Date: Sun,  5 Nov 2017 19:09:51 +0200
-
-Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com>
----
- drivers/input/mouse/synaptics.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index ee5466a374bf..b3c683a84d3f 100644
---- a/drivers/input/mouse/synaptics.c
-+++ b/drivers/input/mouse/synaptics.c
-@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = {
- 	"LEN0048", /* X1 Carbon 3 */
- 	"LEN0046", /* X250 */
- 	"LEN004a", /* W541 */
-+	"LEN0073", /* X1 Carbon 5 */
- 	"LEN200f", /* T450s */
- 	NULL
- };