netfilter: conntrack: remove two args from resolve_clash

mainline inclusion
from mainline-v5.6-rc3
commit 3d1e0b40
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63OS1


CVE: NA

--------------------------------

ctinfo is whats taken from the skb, i.e.
ct = nf_ct_get(skb, &ctinfo).

We do not pass 'ct' and instead re-fetch it from the skb.
Just do the same for both netns and ctinfo.

Also add a comment on what clash resolution is supposed to do.
While at it, one indent level can be removed.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sun Shouxin <sunshouxin@chinatelecom.cn>
Signed-off-by: Xibo.Wang <wangxb12@chinatelecom.cn>

conflict:
	net/netfilter/nf_conntrack_core.c

Signed-off-by: Lu Wei <luwei32@huawei.com>