From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751930AbdHGE7x (ORCPT ); Mon, 7 Aug 2017 00:59:53 -0400 Received: from ozlabs.org ([103.22.144.67]:57555 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbdHGE7v (ORCPT ); Mon, 7 Aug 2017 00:59:51 -0400 Date: Mon, 7 Aug 2017 14:59:49 +1000 From: Stephen Rothwell To: Neal Cardwell Cc: David Miller , Networking , Linux-Next Mailing List , Linux Kernel Mailing List , Yuchung Cheng Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170807145949.4c4f4dc6@canb.auug.org.au> In-Reply-To: References: <20170807120113.5e51eec0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Neal, On Sun, 6 Aug 2017 22:21:43 -0400 Neal Cardwell wrote: > > > 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. The above is a generic statement I add to all these emails. It is aimed more at the maintainers if the trees involved, no the developers of patches. I don't think you need to do anything different in these cases with the "net" and "net-next" tree. Dave Miller will fix up any conflicts when he next merges the net tree into the net-next tree. -- Cheers, Stephen Rothwell