!2713 Fix netfilter conntrack

Merge Pull Request from: @ci-robot 
 
PR sync from: Lu Wei <luwei32@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6GSEK3YM6DDWX2QQXZ7ROS4QPFIJFZDM/ 
Florian Westphal (7):
  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
  netfilter: conntrack: fix infinite loop on rmmod


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I63OS1 
 
Link:https://gitee.com/openeuler/kernel/pulls/2713

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>