Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906AbdHGCWR (ORCPT ); Sun, 6 Aug 2017 22:22:17 -0400 Received: from mail-qk0-f182.google.com ([209.85.220.182]:33266 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751513AbdHGCWP (ORCPT ); Sun, 6 Aug 2017 22:22:15 -0400 MIME-Version: 1.0 In-Reply-To: <20170807120113.5e51eec0@canb.auug.org.au> References: <20170807120113.5e51eec0@canb.auug.org.au> From: Neal Cardwell Date: Sun, 6 Aug 2017 22:21:43 -0400 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell Cc: David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Yuchung Cheng Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 887 Lines: 28 On Sun, Aug 6, 2017 at 10:01 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/tcp_output.c > > 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. thanks, neal