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

!4600 Backport 5.10.190 LTS patches from upstream

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


Conflicts:
Already merged(16):
ab5a97a94b57 netfilter: nf_tables: skip immediate deactivate in _PREPARE_ERROR
b4256c99a711 net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
a8d478200b10 net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
aaa71c4e8ad9 net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
5ea23f1cb67e net: tun_chr_open(): set sk_uid from current_fsuid()
33a339e717be net: tap_open(): set sk_uid from current_fsuid()
c9c78b91c783 open: make RESOLVE_CACHED correctly test for O_TMPFILE
06f87c96216b Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
381f7df0f3c3 exfat: check if filename entries exceeds max filename length
b6fc2fbf8908 x86/CPU/AMD: Do not leak quotient data after a division by 0
076f786f0414 net: hns3: fix wrong bw weight of disabled tc issue
0cd74fbd3b83 tcp: Reduce chance of collisions in inet6_hashfn().
308a43f1521d netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
a6d2fd1703cd tracing: Fix warning in trace_buffered_event_disable()
c08de20e7041 selftests/rseq: check if libc rseq support is registered
832a4d4cdb3f loop: Select I/O scheduler 'none' from inside add_disk()

Rejected(6):
344b7c000398 net: hns3: reconstruct function hclge_ets_validate()
ba7d1dae9fe8 x86/kprobes: Use int3 instead of debug trap for single-step
2b5afe25f5b6 x86/kprobes: Fix to identify indirect jmp and others using range case
f07f3938c813 x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration
edc2ac7c7265 x86/kprobes: Update kcb status flag after singlestepping
058c0cbd251a x86/kprobes: Fix JNG/JNLE emulation


Kabi broken(10):
5f6d5b58c59e drm/ttm: add ttm_bo_pin()/ttm_bo_unpin() v2
8996b13051f0 drm/ttm: never consider pinned BOs for eviction&swap
4148f28f9824 drm/ttm: make ttm_bo_unpin more defensive
d39971d902d0 drm/ttm: check null pointer before accessing when swapping
840ce9cfc86f tracing: Show real address for trace event arguments
426656e8dd03 tracing: Fix sleeping while atomic in kdb ftdump
5601d812c8d8 kprobes/x86: Fix fall-through warnings for Clang
ff97a14c8a86 x86/kprobes: Do not decode opcode in resume_execution()
41db23bad952 x86/kprobes: Retrieve correct opcode for group
2c57553a77e1 x86/kprobes: Identify far indirect JMP correctly


Total patches: 202 - 16 - 6 - 10 = 170 
 
Link:https://gitee.com/openeuler/kernel/pulls/4600

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4ef17653 c234112e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment