On Sun, Aug 6, 2017 at 10:01 PM, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi all,
> Today's linux-next merge of the net-next tree got a conflict in:
> between commit:
> a2815817ffa6 ("tcp: enable xmit timer fix by having TLP use time when RTO
> should fire")
> from the net tree and commit:
> bb4d991a28cc ("tcp: adjust tail loss probe timeout")
> 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.
Sorry about that. Will try to follow that procedure in the future.