diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
| commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
| tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
| parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
| download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.zip | |
merge origin
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 e679aeb55..150ddd76f 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,7 +15,7 @@ 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 489bb5b59475..26bb39b62956 100644 +index b2f2fcfdf732..a9e4c059d402 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1245,9 +1245,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) @@ -31,5 +31,5 @@ index 489bb5b59475..26bb39b62956 100644 goto out; } -- -2.26.2 +2.28.0 |