Unverified Commit ed3dd346 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!807 Backport 5.10.153 LTS

Merge Pull Request from: @sanglipeng 
 
Backport 5.10.153 LTS patches from upstream.

Conflicts:

Already merged(3):
935a8b620210 mm/memory: add non-anonymous page check in the copy_present_page()
568e3812b177 mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
  (Already merged mainline commit 12df140f mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages)
d523384766fd scsi: sd: Revert "scsi: sd: Remove a local variable"
  (Already merged commit 7d7fe3e4 scsi: sd: Revert "scsi: sd: Remove a local variable") 

Context confilict(1):  
3b250824b6d3 xhci: Add quirk to reset host back to default state at shutdown
        
Rejected(4):
ce605b68db53 net: hinic: fix incorrect assignment issue in hinic_set_interrupt_cfg()
  (The involved file drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c is already deleted
    by the commit f1168d29 net/hinic: Update Hardware Abstract Layer)
bb01910763f9 net: hinic: fix memory leak when reading function table
  (The involved file drivers/net/ethernet/huawei/hinic/hinic_debugfs.c is already deleted
    by the commit f1168d29 net/hinic: Update Hardware Abstract Layer)
6603843c80b1 net: hinic: fix the issue of CMDQ memory leaks
  (The involved file drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c is already deleted
    by the commit f1168d29 net/hinic: Update Hardware Abstract Layer))
0ce1ef335300 net: hinic: fix the issue of double release MBOX callback of VF
   (The involved function hinic_vf_func_init() is moved to other file.)

Total patches: 91 - 3 - 4 = 84 
 
Link:https://gitee.com/openeuler/kernel/pulls/807

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 682685d0 d1fec5ec
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment