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

!5188 Backport 5.10.198 LTS patches from upstream

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


Conflicts:

context confilict(2):  
448be0774882  netfilter: nf_tables: GC transaction API to avoid race with control plane
4046f2b56e5a  netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path


Already merged(25):
407bf1c140f0  tracing: Increase trace array ref count on enable and filter files
9b65bff30a61  tracing: Have event inject files inc the trace array ref count
60d73c62e3e4  dccp: fix dccp_v4_err()/dccp_v6_err() again
04cc361f029c  net: bridge: use DEV_STATS_INC()
b44dd92e2afd  team: fix null-ptr-deref when team device type is changed
f515112e8337  net: rds: Fix possible NULL-pointer dereference
7130a87ca323  nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
d0952ce316d1  drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
10a18c8bac7f  wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
2ea52a2fb8e8  net: fix possible store tearing in neigh_periodic_work()
96b2e1090397  ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
30bc4d7aebe3  net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
6a24d0661fa3  tipc: fix a potential deadlock on &tx->lock
660627c71bc1  xen/events: replace evtchn_rwlock with RCU
69c966583022  ata: libahci: clear pending interrupt status
78ef69b6e770  selftests/tls: Add {} to avoid static checker warning
8689c9ace976  ipv4: fix null-deref in ipv4_link_failure
309af4a39b8e  net: hns3: only enable unicast promisc when mac table full
1671dc1b25e5  net: hns3: add 5ms delay before clear firmware reset irq source
a8460ee6c80b  seqlock: avoid -Wshadow warnings
cee5151c5410  ring-buffer: Do not attempt to read past "commit"
2afd8fcee0c4  scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command
f6cf19c1b313  ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
f94471c0cc31  block: fix use-after-free of q->q_usage_counter
a5f643ab1163  ubi: Refuse attaching if mtd's erasesize is 0

Rejected(9):
11d15a115c90  ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
c323ed65f66e  netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
f8e8e72c58c7  sched/cpuacct: Fix user/system in shown cpuacct.usage*
82756d8a2394  sched/cpuacct: Fix charge percpu cpuusage
b2788f6d4924  sched/cpuacct: Optimize away RCU read lock
5a03b42ae1ed  netfilter: nf_tables: disallow rule removal from chain binding
3a5142f01758  netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
d8f2ba9ec358  ima: rework CONFIG_IMA dependency block
dba849cc9811  net: nfc: llcp: Add lock when modifying device list

Kabi broken(1):
c45d7427c442  netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp

Total patches: 227 - 25 - 9 - 1 = 192 
 
Link:https://gitee.com/openeuler/kernel/pulls/5188

 

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