From: David S. Miller <davem@davemloft.net>
Date: Sat, 11 Jan 2020 22:52:56 +0000 (-0800)
Subject: Merge branch 'hns3-next'
X-Git-Tag: v5.10.7~3383^2~110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c9166f038257d6130865b267cb45d87f126b3dd;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'hns3-next'

Huazhong Tan says:

====================
net: hns3: add some misc update about reset issue

This series includes some misc update relating to reset issue.
[patch 1/7] & [patch 2/7] splits hclge_reset()/hclgevf_reset()
into two parts: preparing and rebuilding. Since the procedure
of FLR should be separated out from the reset task([patch 3/7 &
patch 3/7]), then the FLR's processing can reuse these codes.

pci_error_handlers.reset_prepare() is void type function, so
[patch 6/7] & [patch 7/7] factor some codes related to PF
function reset to make the preparing done before .reset_prepare()
return.

BTW, [patch 5/7] enlarges the waiting time of reset for matching
the hardware's.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

5c9166f038257d6130865b267cb45d87f126b3dd