summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-06-05 11:49:39 -0400
committerJeremy Cline <jcline@redhat.com>2018-06-05 11:52:58 -0400
commitbfc64875b123f5d5fac0478cbb1ba5de6f6eadc2 (patch)
treedd185cd03bd72e28228063b59243895376823f73
parentb5f6906612f259606c39f138992b62bea1e0d381 (diff)
downloadkernel-bfc64875b123f5d5fac0478cbb1ba5de6f6eadc2.tar.gz
kernel-bfc64875b123f5d5fac0478cbb1ba5de6f6eadc2.tar.xz
kernel-bfc64875b123f5d5fac0478cbb1ba5de6f6eadc2.zip
Linux v4.16.14
-rw-r--r--kernel.spec8
-rw-r--r--sources2
-rw-r--r--v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch29
3 files changed, 5 insertions, 34 deletions
diff --git a/kernel.spec b/kernel.spec
index de9bd28c5..856a6d931 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 13
+%define stable_update 14
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -646,9 +646,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
-
# In v4.17
# rhbz 1549316
Patch504: ipmi-fixes.patch
@@ -1926,6 +1923,9 @@ fi
#
#
%changelog
+* Tue Jun 05 2018 Jeremy Cline <jcline@redhat.com> - 4.16.14-200
+- Linux v4.16.14
+
* Mon Jun 04 2018 Jeremy Cline <jeremy@jcline.org>
- Drop SanDisk SD7UB3Q*G1001 NOLPM quirk (rhbz 1583207)
diff --git a/sources b/sources
index 34471a85c..0a7004ae1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
-SHA512 (patch-4.16.13.xz) = f136eadbaff335b5c9cd45a9265b4ce4409c141372bc7af378c5a6bbb50330bf16d75ef29294f2b876961292c4c2606980e3d169b98e5b413d6c1b13f5eed37e
+SHA512 (patch-4.16.14.xz) = 5141b66352e6560058ab857e00ba72c84796e135d30cae6398de8e7cf9dfcf266fb581008d2209b0dc20d7dbbcd4e65296557acd3c806fb057dfb55850cd3975
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
- };