diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
| commit | 76aaf5ee07624bd9dbdc426e38a4059bf56f52e5 (patch) | |
| tree | 9392ac81841d28a8f5fd07814de421fbb772df56 /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | d5f831500b4b36dba3f9bae6e8ac14266b495790 (diff) | |
| parent | 4403d9295a23adb83010ef08e1d4bbf481057131 (diff) | |
| download | kernel-5.8.0-1.vanilla.1.fc33.tar.gz kernel-5.8.0-1.vanilla.1.fc33.tar.xz kernel-5.8.0-1.vanilla.1.fc33.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-1.vanilla.1.fc33kernel-5.8.0-1.vanilla.1.fc32kernel-5.8.0-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 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); } |