summaryrefslogtreecommitdiffstats
path: root/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-04 16:46:33 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-04 16:46:33 -0500
commit728cc6ed65d0536c42e067ed0c544d614988087e (patch)
treef5991a19b0130c8354171a2796150c2ee0cb6b2d /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
parent95dc4cf28c756d993d2080a495935006100a62a2 (diff)
downloadkernel-728cc6ed65d0536c42e067ed0c544d614988087e.tar.gz
kernel-728cc6ed65d0536c42e067ed0c544d614988087e.tar.xz
kernel-728cc6ed65d0536c42e067ed0c544d614988087e.zip
kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1
* Thu Jun 04 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc0.20200604git9fb4c5250f10.1] - More Fedora config work ("Justin M. Forbes") Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch')
-rw-r--r--0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
index 8e740ce24..40b387821 100644
--- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
+++ b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
@@ -15,10 +15,10 @@ Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-index 735bf25952fc..15f6c0a4dc63 100644
+index f999cca37a8a..9cbd2d6c7da4 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-@@ -1243,9 +1243,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
+@@ -1247,9 +1247,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
ew32(H2ME, mac_reg);
}