Linux v4.14
This commit is contained in:
Justin M. Forbes
parent
ffd0c6f9f3
commit
67839dbacf
2
gitrev
2
gitrev
|
|
@ -1 +1 @@
|
|||
1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
|
||||
bebc6082da0a9f5d47a1ea2edc099bf671058bd4
|
||||
|
|
|
|||
15
kernel.spec
15
kernel.spec
|
|
@ -6,7 +6,7 @@ Summary: The Linux kernel
|
|||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||
# be 0.
|
||||
%global released_kernel 0
|
||||
%global released_kernel 1
|
||||
|
||||
# Sign modules on x86. Make sure the config files match this setting if more
|
||||
# architectures are added.
|
||||
|
|
@ -48,7 +48,7 @@ Summary: The Linux kernel
|
|||
# base_sublevel is the kernel version we're starting with and patching
|
||||
# on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
|
||||
# which yields a base_sublevel of 0.
|
||||
%define base_sublevel 13
|
||||
%define base_sublevel 14
|
||||
|
||||
## If this is a released kernel ##
|
||||
%if 0%{?released_kernel}
|
||||
|
|
@ -67,9 +67,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%global rcrev 8
|
||||
%global rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 3
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -125,7 +125,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 0
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
# Want to build a vanilla kernel build without any non-upstream patches?
|
||||
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
|
||||
|
|
@ -650,7 +650,6 @@ Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
|
|||
Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch
|
||||
|
||||
# rhbz 1509461
|
||||
Patch624: v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch
|
||||
Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
|
||||
|
||||
# rhbz 1490803
|
||||
|
|
@ -2210,6 +2209,10 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Nov 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-1
|
||||
- Linux v4.14
|
||||
- Disable debugging options.
|
||||
|
||||
* Fri Nov 10 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc8.git3.1
|
||||
- Linux v4.14-rc8-66-g1c9dbd4615fd
|
||||
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,4 +1,2 @@
|
|||
SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
|
||||
SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
|
||||
SHA512 (patch-4.14-rc8.xz) = 073c16c0813087ebdc04fc938d77edd797e630843ed8bb396df261c425e9be385578989df63da07f6861245c8bda84ba0e54019071f8b5e858d0d536baa72e4c
|
||||
SHA512 (patch-4.14-rc8-git3.xz) = bbb603285b111825c15ff229df506c3f0d0f09f7a2668fe99a4f0659b1d26f437382d75949f1d6874b73938ef9a709af77b88bb0fdfcfd2c10f8869ec64ddf71
|
||||
SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
|
||||
SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
From patchwork Sun Nov 5 17:09:50 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v3,1/2] Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
|
||||
From: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
X-Patchwork-Id: 10042385
|
||||
Message-Id: <20171105170951.20261-2-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:50 +0200
|
||||
|
||||
Some synaptics devices such as LEN0073 use SMBUS version 3.
|
||||
|
||||
Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
Acked-by: Benjamin Tissoires <benjamion.tissoires@redhat.com>
|
||||
---
|
||||
drivers/input/rmi4/rmi_smbus.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c
|
||||
index 225025a0940c..b6ccf39c6a7b 100644
|
||||
--- a/drivers/input/rmi4/rmi_smbus.c
|
||||
+++ b/drivers/input/rmi4/rmi_smbus.c
|
||||
@@ -312,7 +312,7 @@ static int rmi_smb_probe(struct i2c_client *client,
|
||||
rmi_smb->xport.dev = &client->dev;
|
||||
rmi_smb->xport.pdata = *pdata;
|
||||
rmi_smb->xport.pdata.irq = client->irq;
|
||||
- rmi_smb->xport.proto_name = "smb2";
|
||||
+ rmi_smb->xport.proto_name = "smb";
|
||||
rmi_smb->xport.ops = &rmi_smb_ops;
|
||||
|
||||
smbus_version = rmi_smb_get_version(rmi_smb);
|
||||
@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client,
|
||||
rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d",
|
||||
smbus_version);
|
||||
|
||||
- if (smbus_version != 2) {
|
||||
+ if (smbus_version != 2 && smbus_version != 3) {
|
||||
dev_err(&client->dev, "Unrecognized SMB version %d\n",
|
||||
smbus_version);
|
||||
return -ENODEV;
|
||||
Loading…
Reference in New Issue