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

!780 Backport 5.10.152 LTS

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

Conflicts:

Already merged(6):
392536023da1 block: wbt: Remove unnecessary invoking of wbt_update_limits in wbt_init
910ba49b3345 blk-wbt: call rq_qos_add() after wb_normal is initialized 
51b96ecaedc0 arm64: errata: Remove AES hwcap for COMPAT tasks  
7aa3d623c11b net: sched: fix race condition in qdisc_graft()  
f687e2111b6f fcntl: fix potential deadlocks for &fown_struct.lock 
  (merged mainline commit f671a691 fcntl: fix potential deadlocks for &fown_struct.lock)
31b1570677e8 blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init() 

Context conflict(3):
dea47fefa6aa perf pmu: Validate raw event with sysfs exported format bits
b1efc196446a fcntl: make F_GETOWN(EX) return 0 on dead owner task

Rejected(1):
a6e770733dc4 arm64: topology: move store_cpu_topology() to shared code

Total patches: 72 - 6 -1 = 65 
 
Link:https://gitee.com/openeuler/kernel/pulls/780

 

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