| Message ID | 20201001135237.6ec2468a@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 Thu, 1 Oct 2020, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/mptcp/protocol.h > > between commit: > > 1a49b2c2a501 ("mptcp: Handle incoming 32-bit DATA_FIN values") > > from the net tree and commit: > > 5c8c1640956e ("mptcp: add mptcp_destroy_common helper") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc net/mptcp/protocol.h > index 20f04ac85409,7cfe52aeb2b8..000000000000 > --- a/net/mptcp/protocol.h > +++ b/net/mptcp/protocol.h > @@@ -387,7 -407,8 +407,8 @@@ void mptcp_data_ready(struct sock *sk, > bool mptcp_finish_join(struct sock *sk); > void mptcp_data_acked(struct sock *sk); > void mptcp_subflow_eof(struct sock *sk); > -bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq); > +bool mptcp_update_rcv_data_fin(struct mptcp_sock *msk, u64 data_fin_seq, bool use_64bit); > + void mptcp_destroy_common(struct mptcp_sock *msk); > Yes, this is the appropriate conflict resolution. Thanks! -- Mat Martineau Intel
diff --cc net/mptcp/protocol.h index 20f04ac85409,7cfe52aeb2b8..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: 1a49b2c2a501 ("mptcp: Handle incoming 32-bit DATA_FIN values") from the net tree and commit: 5c8c1640956e ("mptcp: add mptcp_destroy_common helper") 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.