| Message ID | 20201012134510.51c0bd0a@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
diff --cc net/mptcp/protocol.h index 972463642690,aa0ab18d2e57..000000000000 --- a/net/mptcp/protocol.h
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mptcp/protocol.h between commit: d582484726c4 ("mptcp: fix fallback for MP_JOIN subflows") from the net tree and commit: d0876b2284cf ("mptcp: add the incoming RM_ADDR support") 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.