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-08-03 08:39:23 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-08-03 08:39:23 -0500
commit4403d9295a23adb83010ef08e1d4bbf481057131 (patch)
tree354c6eed069e229fafb15825f209ddbf3b43d6c8 /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
parentb303d37046fa46d3601382b22ada6ab3fea12962 (diff)
downloadkernel-4403d9295a23adb83010ef08e1d4bbf481057131.tar.gz
kernel-4403d9295a23adb83010ef08e1d4bbf481057131.tar.xz
kernel-4403d9295a23adb83010ef08e1d4bbf481057131.zip
kernel-5.8.0-1
* Mon Aug 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-1] - v5.8 rebase - Updated changelog for the release based on ac3a0c847296 (Fedora Kernel Team) 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 40b387821..e679aeb55 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 f999cca37a8a..9cbd2d6c7da4 100644
+index 489bb5b59475..26bb39b62956 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-@@ -1247,9 +1247,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
+@@ -1245,9 +1245,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
ew32(H2ME, mac_reg);
}