Patch 74e78d6bae19 ("net: hns3: fix a wrong reset interrupt status mask") fixes 2336f19d7892 ("net: hns3: check reset interrupt status when reset fails")
Patch 2336f19d7892 ("net: hns3: check reset interrupt status when reset fails") fixes 72e2fb07997c ("net: hns3: clear reset interrupt status in hclge_irq_handle()")
Patch 72e2fb07997c ("net: hns3: clear reset interrupt status in hclge_irq_handle()") fixes 4ed340ab8f49 ("net: hns3: Add reset process in hclge_main")
But patch 72e2fb07997c fails to clean cherry-pick.
ikepanhc@ubuntu:~/ubuntu-bionic$ git cherry-pick -x -s 72e2fb07997c
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 10159 and retry the command.
error: could not apply 72e2fb07997c... net: hns3: clear reset interrupt status in hclge_irq_handle()
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Since we can run iperf testing on hns3 and get > 80% of limitation for an hour and multiple times, I don't think this is a issue we need to fix for bionic GA kernel.
Patch 74e78d6bae19 ("net: hns3: fix a wrong reset interrupt status mask") fixes 2336f19d7892 ("net: hns3: check reset interrupt status when reset fails")
Patch 2336f19d7892 ("net: hns3: check reset interrupt status when reset fails") fixes 72e2fb07997c ("net: hns3: clear reset interrupt status in hclge_irq_ handle( )")
Patch 72e2fb07997c ("net: hns3: clear reset interrupt status in hclge_irq_ handle( )") fixes 4ed340ab8f49 ("net: hns3: Add reset process in hclge_main")
But patch 72e2fb07997c fails to clean cherry-pick.
ikepanhc@ ubuntu: ~/ubuntu- bionic$ git cherry-pick -x -s 72e2fb07997c net/ethernet/ hisilicon/ hns3/hns3vf/ hclgevf_ main.h net/ethernet/ hisilicon/ hns3/hns3vf/ hclgevf_ main.c net/ethernet/ hisilicon/ hns3/hns3vf/ hclgevf_ main.c net/ethernet/ hisilicon/ hns3/hns3pf/ hclge_main. c net/ethernet/ hisilicon/ hns3/hns3pf/ hclge_main. c net/ethernet/ hisilicon/ hns3/hns3pf/ hclge_cmd. h
Auto-merging drivers/
Auto-merging drivers/
CONFLICT (content): Merge conflict in drivers/
Auto-merging drivers/
CONFLICT (content): Merge conflict in drivers/
Auto-merging drivers/
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 10159 and retry the command.
error: could not apply 72e2fb07997c... net: hns3: clear reset interrupt status in hclge_irq_handle()
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Since we can run iperf testing on hns3 and get > 80% of limitation for an hour and multiple times, I don't think this is a issue we need to fix for bionic GA kernel.