Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-1.vanilla.knurd.1.fc28kernel-4.14.0-1.vanilla.knurd.1.fc27kernel-4.14.0-1.vanilla.knurd.1.fc26kernel-4.14.0-1.vanilla.knurd.1.fc25

5 files changed, 66 insertions, 64 deletions

diff --git a/USB-ulpi-fix-bus-node-lookup.patch b/USB-ulpi-fix-bus-node-lookup.patch
new file mode 100644
index 000000000..835cf2ab6
--- /dev/null
+++ b/USB-ulpi-fix-bus-node-lookup.patch
@@ -0,0 +1,48 @@
+From patchwork Sat Nov 11 15:31:18 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: USB: ulpi: fix bus-node lookup
+From: Johan Hovold <johan@kernel.org>
+X-Patchwork-Id: 10054387
+Message-Id: <20171111153118.16038-1-johan@kernel.org>
+To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
+ linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
+ linux-arm-msm@vger.kernel.org, Rob Clark <robdclark@gmail.com>,
+ Peter Robinson <pbrobinson@gmail.com>, Johan Hovold <johan@kernel.org>,
+ stable <stable@vger.kernel.org>
+Date: Sat, 11 Nov 2017 16:31:18 +0100
+
+Fix bus-node lookup during registration, which ended up searching the whole
+device tree depth-first starting at the parent (or grand parent) rather
+than just matching on its children.
+
+To make things worse, the parent (or grand-parent) node could end being
+prematurely freed as well.
+
+Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT")
+Reported-by: Peter Robinson <pbrobinson@gmail.com>
+Reported-by: Stephen Boyd <sboyd@codeaurora.org>
+Cc: stable <stable@vger.kernel.org>     # 4.10
+Signed-off-by: Johan Hovold <johan@kernel.org>
+---
+ drivers/usb/common/ulpi.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
+index 8b351444cc40..9a2ab6751a23 100644
+--- a/drivers/usb/common/ulpi.c
++++ b/drivers/usb/common/ulpi.c
+@@ -180,9 +180,9 @@ static int ulpi_of_register(struct ulpi *ulpi)
+ 	/* Find a ulpi bus underneath the parent or the grandparent */
+ 	parent = ulpi->dev.parent;
+ 	if (parent->of_node)
+-		np = of_find_node_by_name(parent->of_node, "ulpi");
++		np = of_get_child_by_name(parent->of_node, "ulpi");
+ 	else if (parent->parent && parent->parent->of_node)
+-		np = of_find_node_by_name(parent->parent->of_node, "ulpi");
++		np = of_get_child_by_name(parent->parent->of_node, "ulpi");
+ 	if (!np)
+ 		return 0;
+ 
diff --git a/gitrev b/gitrev
index 3278c2b02..9da565e93 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
+bebc6082da0a9f5d47a1ea2edc099bf671058bd4
diff --git a/kernel.spec b/kernel.spec
index 433380aa7..920a3d975 100644
--- a/kernel.spec
+++ b/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.
@@ -17,7 +17,7 @@ Summary: The Linux kernel
 %else
 %global signkernel 0
 %global signmodules 1
-%global zipmodules 0
+%global zipmodules 1
 %endif
 
 %if %{zipmodules}
@@ -50,7 +50,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}
@@ -75,9 +75,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
@@ -133,7 +133,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 %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -615,24 +615,16 @@ Patch305: arm-imx6-hummingboard2.patch
 
 Patch306: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
 
-# https://patchwork.kernel.org/patch/9967397/
-
-# https://patchwork.kernel.org/patch/9815555/
-# https://patchwork.kernel.org/patch/9815651/
-# https://patchwork.kernel.org/patch/9819885/
 # https://patchwork.kernel.org/patch/9820417/
-# https://patchwork.kernel.org/patch/9821151/
-# https://patchwork.kernel.org/patch/9821157/
 Patch310: qcom-msm89xx-fixes.patch
 
-# https://patchwork.kernel.org/patch/9831825/
-# https://patchwork.kernel.org/patch/9833721/
+# https://patchwork.kernel.org/patch/10054387/
+Patch311: USB-ulpi-fix-bus-node-lookup.patch
 
 # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
 Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
 
 # bcm2837 bluetooth support
-#
 Patch323: bcm2837-bluetooth-support.patch
 
 # Generic fixes and enablement for Socionext SoC and 96board
@@ -675,7 +667,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
@@ -2238,6 +2229,13 @@ fi
 #
 #
 %changelog
+* Mon Nov 13 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Compress modules on all arches
+
+* 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
 
diff --git a/sources b/sources
index 8b8c32adf..ad3df1e55 100644
--- a/sources
+++ b/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
diff --git a/v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch b/v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch
deleted file mode 100644
index 5a8825793..000000000
--- a/v3-1-2-Input-synaptics-rmi4---RMI4-can-also-use-SMBUS-version-3.patch
+++ /dev/null
@@ -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;