From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69250138206 for ; Wed, 17 Jan 2018 10:20:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C847FE08BB; Wed, 17 Jan 2018 10:20:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9402CE08BB for ; Wed, 17 Jan 2018 10:20:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75A0D335C4E for ; Wed, 17 Jan 2018 10:20:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C14F41A6 for ; Wed, 17 Jan 2018 10:20:47 +0000 (UTC) From: "Alice Ferrazzi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alice Ferrazzi" Message-ID: <1516184042.5aaf29e55c4bcf496fe8b7b21a9c0fb851e34472.alicef@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.4 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch X-VCS-Directories: / X-VCS-Committer: alicef X-VCS-Committer-Name: Alice Ferrazzi X-VCS-Revision: 5aaf29e55c4bcf496fe8b7b21a9c0fb851e34472 X-VCS-Branch: 4.4 Date: Wed, 17 Jan 2018 10:20:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4a8fe1c-8c86-4ca7-b3ab-a414c156783d X-Archives-Hash: bb1ee520b7541b45ad4c1a3bf5a4e77e commit: 5aaf29e55c4bcf496fe8b7b21a9c0fb851e34472 Author: Alice Ferrazzi gentoo org> AuthorDate: Wed Jan 17 10:14:02 2018 +0000 Commit: Alice Ferrazzi gentoo org> CommitDate: Wed Jan 17 10:14:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=5aaf29e5 removed patch e1000e: Separate signaling for link check/link up (upstreamed) 0000_README | 4 -- ...heck_for_copper_link_ich8lan-return-value.patch | 66 ---------------------- 2 files changed, 70 deletions(-) diff --git a/0000_README b/0000_README index 13b9a6c..1c143d1 100644 --- a/0000_README +++ b/0000_README @@ -503,10 +503,6 @@ Patch: 1900_xfs-fix-suspend-to-memory.patch From: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/fs/xfs/xfs_trans_ail.c?id=18f1df4e00cea2eae41f3e5515b94d1e7127b2b6 Desc: xfs: Make xfsaild freezeable again. See bug #575034. -Patch: 2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch -From: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-4.4/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch -Desc: Fix link is not ready / does not come up on e1000e ICH8 network interfaces. See bug #641818. - Patch: 2700_ThinkPad-30-brightness-control-fix.patch From: Seth Forshee Desc: ACPI: Disable Windows 8 compatibility for some Lenovo ThinkPads. diff --git a/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch b/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch deleted file mode 100644 index 34557d0..0000000 --- a/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4110e02eb45ea447ec6f5459c9934de0a273fb91 Mon Sep 17 00:00:00 2001 -From: Benjamin Poirier -Date: Mon, 11 Dec 2017 16:26:40 +0900 -Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value. - -From: Benjamin Poirier - -commit 4110e02eb45ea447ec6f5459c9934de0a273fb91 upstream. - -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") -Signed-off-by: Benjamin Poirier -Tested-by: Aaron Brown -Tested-by: Christian Hesse -Signed-off-by: Jeff Kirsher -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -1362,6 +1362,9 @@ out: - * 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) - { -@@ -1377,7 +1380,7 @@ static s32 e1000_check_for_copper_link_i - * 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 -@@ -1585,10 +1588,12 @@ static s32 e1000_check_for_copper_link_i - * 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)