Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

4 files changed, 85 insertions, 5 deletions

diff --git a/e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch b/e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch
new file mode 100644
index 000000000..a31d5d2c5
--- /dev/null
+++ b/e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch
@@ -0,0 +1,70 @@
+From patchwork Mon Dec 11 07:26:40 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
+From: Benjamin Poirier <bpoirier@suse.com>
+X-Patchwork-Id: 10104349
+Message-Id: <20171211072640.7935-1-bpoirier@suse.com>
+To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>,
+ Christian Hesse <list@eworm.de>, Gabriel C <nix.or.die@gmail.com>,
+ intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
+ linux-kernel@vger.kernel.org, stable@vger.kernel.org
+Date: Mon, 11 Dec 2017 16:26:40 +0900
+
+e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan()
+are the two functions that may be assigned to mac.ops.check_for_link when
+phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e:
+Separate signaling for link check/link up") changed the meaning of the
+return value of check_for_link for copper media but only adjusted the first
+function. This patch adjusts the second function likewise.
+
+Reported-by: Christian Hesse <list@eworm.de>
+Reported-by: Gabriel C <nix.or.die@gmail.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047
+Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up")
+Tested-by: Christian Hesse <list@eworm.de>
+Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
+---
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index d6d4ed7acf03..31277d3bb7dc 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -1367,6 +1367,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
+  *  Checks to see of the link status of the hardware has changed.  If a
+  *  change in link status has been detected, then we read the PHY registers
+  *  to get the current speed/duplex if link exists.
++ *
++ *  Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link
++ *  up).
+  **/
+ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
+ {
+@@ -1382,7 +1385,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
+ 	 * Change or Rx Sequence Error interrupt.
+ 	 */
+ 	if (!mac->get_link_status)
+-		return 0;
++		return 1;
+ 
+ 	/* First we want to see if the MII Status Register reports
+ 	 * link.  If so, then we want to get the current speed/duplex
+@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
+ 	 * different link partner.
+ 	 */
+ 	ret_val = e1000e_config_fc_after_link_up(hw);
+-	if (ret_val)
++	if (ret_val) {
+ 		e_dbg("Error configuring flow control\n");
++		return ret_val;
++	}
+ 
+-	return ret_val;
++	return 1;
+ }
+ 
+ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
diff --git a/gitrev b/gitrev
index 5db6b1ddb..c0a7e17e6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-ace52288edf0cb5e7a52b681f057f86224c49c27
+d1ce8ceb8ba87034bb3c3a9c9324e77546ba8608
diff --git a/kernel.spec b/kernel.spec
index 9e1a9d90f..5d8984b44 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -626,8 +626,9 @@ Patch332: arm64-socionext-96b-enablement.patch
 
 # 500 - Temp fixes/CVEs etc
 
-# rhbz 1498016 1498017
-#Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch
+# rhbz 1525523
+# https://patchwork.kernel.org/patch/10104349/
+Patch500: e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch
 
 # 600 - Patches for improved Bay and Cherry Trail device support
 # Below patches are submitted upstream, awaiting review / merging
@@ -2210,6 +2211,15 @@ fi
 #
 #
 %changelog
+* Thu Dec 21 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc4.git3.1
+- Linux v4.15-rc4-77-gd1ce8ceb8ba8
+
+* Wed Dec 20 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc4.git2.1
+- Linux v4.15-rc4-42-g10a7e9d84915
+
+* Wed Dec 20 2017 Jeremy Cline <jeremy@jcline.org>
+- Backport fix e1000_check_for_copper_link_ich8lan return value
+
 * Tue Dec 19 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc4.git1.1
 - Linux v4.15-rc4-41-gace52288edf0
 
diff --git a/sources b/sources
index 5a3d7fc84..51d013df4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
 SHA512 (patch-4.15-rc4.xz) = e09460a100f4fd6b88503ea9328e0f7463616139152091f0eb5709c7eddb1c7c49c9f80433329be8f7f03f30d82fbf1cdfd020e84656e130d63380eac1858de7
-SHA512 (patch-4.15-rc4-git1.xz) = 3edf9417cd03a8df03637b61a5e8da8409afd9e2917c38693174d8013703c036631b5dd195dd6cff8c00bce6d435d5e490b8e19ed65338e37c8b1d5457aca7ba
+SHA512 (patch-4.15-rc4-git3.xz) = d8d2510b6d3dd4e3b5eb670b6a895b22206d824650c812f7d2bdaa54d8ad7e6733e76cd8a4befd9a1fcd8f360b6127a230eeab4ea2c5d80615c65828ce6673c3