| Message ID | 20200228102451.0a3d2057@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 |
On Fri, 2020-02-28 at 10:24 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got a conflict in: > > net/mptcp/protocol.c > > between commit: > > dc24f8b4ecd3 ("mptcp: add dummy icsk_sync_mss()") > > from the net tree and commit: > > 80992017150b ("mptcp: add work queue skeleton") > > 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. Thank you, the conflict resolution looks good to me. I did not notice the conflict beforehands, sorry. Cheers, Paolo
diff --cc net/mptcp/protocol.c index 3c19a8efdcea,044295707bbf..000000000000 --- a/net/mptcp/protocol.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mptcp/protocol.c between commit: dc24f8b4ecd3 ("mptcp: add dummy icsk_sync_mss()") from the net tree and commit: 80992017150b ("mptcp: add work queue skeleton") 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.