| Message ID | 20201210131113.6394fe45@canb.auug.org.au |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the netfilter tree | expand |
diff --cc net/netfilter/nf_tables_api.c index 9a080767667b,a11bc8dcaa82..000000000000 --- a/net/netfilter/nf_tables_api.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/netfilter/nf_tables_api.c between commit: 42f1c2712090 ("netfilter: nftables: comment indirect serialization of commit_mutex with rtnl_mutex") from the netfilter tree and commit: 872f69034194 ("treewide: rename nla_strlcpy to nla_strscpy.") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.