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

!2390 Backport 5.10.174 - 5.10.175 LTS patches from upstream.

Merge Pull Request from: @sanglipeng 
 
Issue: https://gitee.com/open_euler/dashboard?issue_id=I8711T

Backport 5.10.174 -  5.10.175 LTS patches from upstream.

Conflicts:

Already merged(2):
1d2366624b4c:ext4: fix another off-by-one fsmap error on 1k block filesystems
a4932a2c5446:ipmi:watchdog: Set panic count to proper value on a panic

Rejected(1):
7aa5a495cbf8:ipmi/watchdog: replace atomic_add() and atomic_sub()

Kabi broken(2):
bb7597777c13:irqdomain: Change the type of 'size' in __irq_domain_add() to be consistent
aeab1f1a60ae:irqdomain: Fix domain registration race

Total patches: 93 - 2 - 1 -2 = 88 
 
Link:https://gitee.com/openeuler/kernel/pulls/2390

 

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