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

!1468 Backport 5.10.155 LTS

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

Conflicts:

Already merged(3):
cc21dc48a78c: bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues
02f8dfee7580: tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent
0f544353fec8: io_uring: kill goto error handling in io_sqpoll_wait_sq()

Total patches: 97 - 3 = 94 
 
Link:https://gitee.com/openeuler/kernel/pulls/1468

 

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