PR sync from: Lu Wei luwei32@huawei.com
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/V35WHD255OBIB6GXRVC7GFZLUESEDM6A/
Florian Westphal (6):
netfilter: conntrack: tell compiler to not inline nf_ct_resolve_clash
netfilter: conntrack: remove two args from resolve_clash
netfilter: conntrack: place confirm-bit setting in a helper
netfilter: conntrack: split resolve_clash function
netfilter: conntrack: allow insertion of clashing entries
netfilter: conntrack: do not auto-delete clash entries on reply

Zhihao Cheng (1):
ubi: Refuse attaching if mtd's erasesize is 0

--
V2: add a new bugfix patch
2.34.1

#I6YOAJ:CVE-2023-31085
#I63OS1:【openEuler-1.0-LTS】容器场景下，容器内获取dns服务时，会出现长延时的问题