diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 06:28:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 06:28:48 +0200 |
| commit | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (patch) | |
| tree | 7efced3b710d2f69710737776735c8dffe23642e /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (diff) | |
| parent | 728cc6ed65d0536c42e067ed0c544d614988087e (diff) | |
| download | kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.tar.gz kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.tar.xz kernel-d2c10672fc73b0484b5bd441c7a43087a20cfc61.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200604git9fb4c5250f10.1.vanilla.1.fc31
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-.patch | 4 |
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); } |