diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-04 17:00:01 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-04 17:00:01 -0500 |
| commit | 9ab9ea2db0b13375d3d7114d5c82eb298a118740 (patch) | |
| tree | eb4615cacf3e4ee8bd71c2522241011baa6c56fe /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | bf5b588422a50d970ea8660d368cc6cdd2c377c9 (diff) | |
| download | kernel-9ab9ea2db0b13375d3d7114d5c82eb298a118740.tar.gz kernel-9ab9ea2db0b13375d3d7114d5c82eb298a118740.tar.xz kernel-9ab9ea2db0b13375d3d7114d5c82eb298a118740.zip | |
Linux v5.8 rebase
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-.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..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 735bf25952fc..15f6c0a4dc63 100644 +index 489bb5b59475..26bb39b62956 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) +@@ -1245,9 +1245,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) ew32(H2ME, mac_reg); } |