| Message ID | 20220524114408.4bf1af38@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| 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/smc/af_smc.c index d3de54b70c05,5f70642a8044..000000000000 --- a/net/smc/af_smc.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/smc/af_smc.c between commit: 75c1edf23b95 ("net/smc: postpone sk_refcnt increment in connect()") from the net tree and commit: 3aba103006bc ("net/smc: align the connect behaviour with TCP") 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.