From 73c86ebaee23df8310b903c1dab2176d443f5a3a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 10 Nov 2020 11:02:01 -0600 Subject: Linux v5.9.7 rebase Signed-off-by: Justin M. Forbes --- 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch') 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 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 -- cgit