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

!4663 Backport 5.10.191 - 5.10.192 LTS patches from upstream

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

Conflicts:
Already merged(25):
cb1eefc04634 x86/srso: Fix build breakage with the LLVM linker
eda9f8ffca46 x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
3b55ce96efc5 sch_netem: fix issues in netem_change() vs get_dist_table()
98eaa12c967b x86: Move gds_ucode_mitigated() declaration to header
6d0bd7b7b3a7 bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
7e50815d2903 net: xfrm: Fix xfrm_address_filter OOB read
c080cee93030 af_unix: Fix null-ptr-deref in unix_stream_sendpage().
d5b3c88d153c x86/cpu: Fix __x86_return_thunk symbol type
043d3bfe0a72 x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
bd3d12e6fda0 x86/alternative: Make custom return thunk unconditional
bbbe1b23c7e6 objtool: Add frame-pointer-specific function ignore
20e24c8b4c2a x86/ibt: Add ANNOTATE_NOENDBR
8b0ff83e8ad3 x86/cpu: Clean up SRSO return thunk mess
0676a392539b x86/cpu: Rename original retbleed methods
e0f50b0e4186 x86/cpu: Rename srso_(.*)_alias to srso_alias_\1
06597b650beb x86/cpu: Cleanup the untrain mess
62ebfeb0dcf7 x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
69712baf2495 x86/CPU/AMD: Fix the DIV(0) initial fix attempt
88e16ce7f8a6 x86/srso: Disable the mitigation on unaffected configurations 
23e59874657c objtool/x86: Fixup frame-pointer vs rethunk
0e8139f92304 x86/srso: Correct the mitigation status when SMT is disabled
b870b9a47fdb drm/amdgpu: Fix potential fence use-after-free v2
66a3b2a12138 ring-buffer: Do not swap cpu_buffer during resize process
869ce5e59845 tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
bd30aa9c7feb xfrm: add NULL check in xfrm_update_ae_params


Rejected(8):
a16c66baa4de x86/pkeys: Revert a5eff725 ("x86/pkeys: Add PKRU value to init_fpstate")
70660e6faac5 net: hns3: refactor hclge_mac_link_status_wait for interface reuse
e8d349408a49 net: hns3: add wait until mac link down
9ad83e3e6121 nvme-tcp: fix potential unbalanced freeze & unfreeze
cbaebbba722c quota: fix warning in dqgrab()
ecf0e627fbbb macsec: Fix traffic counters/statistics
e77ef787415b macsec: use DEV_STATS_INC()
614811692e21 xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH

Total patches: 196 - 25 - 8 = 163 
 
Link:https://gitee.com/openeuler/kernel/pulls/4663

 

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