| Message ID | 20230127125052.674281f9@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc net/netfilter/nf_conntrack_proto_sctp.c index 945dd40e7077,dbdfcc6cd2aa..000000000000 --- a/net/netfilter/nf_conntrack_proto_sctp.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/netfilter/nf_conntrack_proto_sctp.c between commits: 13bd9b31a969 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"") a44b7651489f ("netfilter: conntrack: unify established states for SCTP paths") from the net tree and commit: f71cb8f45d09 ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets") 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.