[linux] 21/29: drop e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit 6e58404a13152c080f1683a8edb82880469c6e5d
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Jan 18 11:50:13 2018 +0100

    drop e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value
---
 debian/changelog                                   |  3 ++
 ...heck_for_copper_link_ich8lan-return-value.patch | 60 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93ab3ae..3841b00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -791,6 +791,9 @@ linux (4.9.77-1) UNRELEASED; urgency=medium
   * lib/genalloc: Avoid ABI change in 4.9.69.
   * Ignore ABI changes in inet_diag, SCTP, vsock, NVME, MD and libsas drivers,
     prevent FTBFS.
+  * debian/patches:
+    - bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
+    dropped, included upstream.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 28 Dec 2017 02:16:23 +0000
 
diff --git a/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch b/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
deleted file mode 100644
index 9b64374..0000000
--- a/debian/patches/bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Benjamin Poirier <bpoirier at suse.com>
-Date: Mon, 11 Dec 2017 16:26:40 +0900
-Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
-Origin: https://marc.info/?l=linux-kernel&m=151297726823919&w=2
-Bug: https://bugzilla.kernel.org/show_bug.cgi?id=198047
-Bug-Debian: https://bugs.debian.org/885348
-
-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 at eworm.de>
-Reported-by: Gabriel C <nix.or.die at 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 at eworm.de>
-Signed-off-by: Benjamin Poirier <bpoirier at suse.com>
----
- 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
-@@ -1364,6 +1364,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)
- {
-@@ -1379,7 +1382,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
-@@ -1611,10 +1614,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)
diff --git a/debian/patches/series b/debian/patches/series
index 2e60abb..09f0e8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -103,7 +103,6 @@ bugfix/all/mm-mmap.c-expand_downwards-don-t-require-the-gap-if-.patch
 bugfix/x86/mmap-remember-the-map_fixed-flag-as-vm_fixed.patch
 bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch
 bugfix/all/xen-time-do-not-decrease-steal-time-after-live-migra.patch
-bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
 
 # Miscellaneous features
 features/all/netfilter-nft_ct-add-notrack-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git