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

!393 Backport 5.10.143 - 5.10.144 LTS

Merge Pull Request from: @zhangjialin11 
 
Backport 5.10.143 LTS patches from upstream.

Conflicts:

Already merged(7):
2ead78fbe6b5 sch_sfb: Also store skb len before calling child enqueue
2ee85ac1b29d sch_sfb: Don't assume the skb is still around after enqueueing to child
e12ce30fe593 netfilter: nf_conntrack_irc: Fix forged IP logic
b2e82e325a84 RDMA/hns: Fix supported page size
dee1e2b18cf5 cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
bfbacc2ef7b5 cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
918d9c4a4bdf efi: capsule-loader: Fix use-after-free in efi_capsule_write

Defered(2):
71d3adbb2890 arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
13c8f561be38 fs: only do a memory barrier for the first set_buffer_uptodate()

Total patches: 76 - 7 - 2 = 67

Backport 5.10.144 LTS patches from upstream.

Conflicts:

Already merged(3):
35371fd68807 x86/ftrace: Use alternative RET encoding
4586df06a020 x86/ibt,ftrace: Make function-graph play nice
33015556a943 Revert "x86/ftrace: Use alternative RET encoding"

Total patches: 23 - 3 = 20 
 
Link:https://gitee.com/openeuler/kernel/pulls/393

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents d800cf74 821bcfba
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment