From 8b84dd51216f1b8b25d48ffe63ff8a1442386640 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 9 Jan 2018 08:18:38 -0800 Subject: Linux v4.15-rc7-79-gef7f8cec80a0 --- ...eck_for_copper_link_ich8lan-return-value..patch | 70 ---------------------- gitrev | 2 +- kernel.spec | 9 ++- sources | 1 + 4 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch 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 deleted file mode 100644 index a31d5d2c5..000000000 --- a/e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch +++ /dev/null @@ -1,70 +0,0 @@ -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 -X-Patchwork-Id: 10104349 -Message-Id: <20171211072640.7935-1-bpoirier@suse.com> -To: Jeff Kirsher -Cc: Ben Hutchings , - Christian Hesse , Gabriel C , - 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 -Reported-by: Gabriel C -Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047 -Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up") -Tested-by: Christian Hesse -Signed-off-by: Benjamin Poirier ---- - 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 cc4968868..8f811c40e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -e1915c8195b38393005be9b74bfa6a3a367c83b3 +ef7f8cec80a0ba7bd00ece46844c8994117dc910 diff --git a/kernel.spec b/kernel.spec index b8f40cd38..c7adcf941 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -586,10 +586,6 @@ Patch332: arm64-socionext-96b-enablement.patch # 500 - Temp fixes/CVEs etc -# 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 Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch @@ -1891,6 +1887,9 @@ fi # # %changelog +* Tue Jan 09 2018 Laura Abbott - 4.15.0-0.rc7.git1.1 +- Linux v4.15-rc7-79-gef7f8cec80a0 + * Tue Jan 09 2018 Laura Abbott - Reenable debugging options. diff --git a/sources b/sources index d8661af1a..5aad3124f 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 SHA512 (patch-4.15-rc7.xz) = 1c9c74917f5bc5e259d4b918d429d606419f4564ae15f754ef01404234f53d02c8782db0bcce75bf8103510231e723df2fa4a8c8cca8ea4db458b585c0e01570 +SHA512 (patch-4.15-rc7-git1.xz) = 71637b07bac963bd4f34b3dea9e9b3cc33b918c297592c6e229d09ca1649ca232991a6caedbd97847d2a4d1b10bbf82e1f202986d94b878d452df5d5e1c4d10f -- cgit