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

!4674 Backport 5.10.193- 5.10.194 LTS patches from upstream

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


Conflicts:

context confilict(2):  
5ac05ce56843: sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets
2d69f68ad409: cgroup/cpuset: Free DL BW in case can_attach() fails

Already merged(5):
c6aecc29d29e: objtool/x86: Fix SRSO mess
4bc6a4fca1f0: x86/fpu: Set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4
9c2ceffd4e36: tracing: Fix cpu buffers unavailable due to 'record_disabled' missed
b8205dfed681: tracing: Fix memleak due to race between current_tracer and trace
ad4f8c117b8b: rcu: Prevent expedited GP from enabling tick on offline CPU

Rejected(5):
749630ce9147: mm,hwpoison: refactor get_any_page
406166a3acd7: mm: fix page reference leak in soft_offline_page()
20c2db79f157: mm: memory-failure: kill soft_offline_free_page()
32f71ef62737: mm: memory-failure: fix unexpected return value in soft_offline_page()
b3ac2c1d725b: mm,hwpoison: fix printing of page flags

Kabi broken(2):
70dfdbba3070: net: validate veth and vxcan peer ifindexes
72e4a5a28ebf: batman-adv: Hold rtnl lock during MTU update via netlink

Total patches: 95 - 5 - 5 - 2 = 83 
 
Link:https://gitee.com/openeuler/kernel/pulls/4674

 

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