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

!2631 Backport 5.10.178 LTS patches from upstream.

Merge Pull Request from: @sanglipeng 
 
issue: https://gitee.com/openeuler/kernel/issues/I8ALH3

Backport 5.10.178 LTS patches from upstream

Conflicts:

Already merged(6):
499757ad3332: scsi: iscsi_tcp: Check that sock is valid before iscsi_set_param()
f018ef34c44b: ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()
5a74837809cc: ring-buffer: Fix race while reader and writer are on the same page
9266e939d762: 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
0279e82e1484: ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size
5abf8af8df97: ubi: Fix deadlock caused by recursively holding work_sem

Rejected(4):
cc9f9a49f5b3: tcp: convert elligible sysctls to u8
a069d4d98cd2: tcp: restrict net.ipv4.tcp_app_win
33611d4a8181: mtd: ubi: wl: Fix a couple of kernel-doc issues
6facabb4d069: coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug

Kabi broken(1):
f662a0786dfd ipv4: shrink netns_ipv4 with sysctl conversions


Total patches: 120 - 6 - 4 - 1 = 109 
 
Link:https://gitee.com/openeuler/kernel/pulls/2631

 

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