From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935269AbcCPWff (ORCPT ); Wed, 16 Mar 2016 18:35:35 -0400 Received: from ozlabs.org ([103.22.144.67]:59556 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750955AbcCPWfe (ORCPT ); Wed, 16 Mar 2016 18:35:34 -0400 Date: Thu, 17 Mar 2016 09:35:31 +1100 From: Stephen Rothwell To: Andrew Lunn Cc: Linus Torvalds , Doug Ledford , David Miller , Network Development , linux-next , Linux Kernel Mailing List , Amir Vadai , Maor Gottlieb Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree Message-ID: <20160317093531.4894f078@canb.auug.org.au> In-Reply-To: <20160316211503.GA16382@lunn.ch> References: <20160316115809.61b4478e@canb.auug.org.au> <20160317075246.39a08e61@canb.auug.org.au> <20160316211503.GA16382@lunn.ch> 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 Andrew, On Wed, 16 Mar 2016 22:15:03 +0100 Andrew Lunn wrote: > > > How about "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 want also want to > > Only the second want is required. > > > consider cooperate with the maintainer of the conflicting tree to > > cooperating Thanks. Breakfast is not the best time to compose prose :-) -- Cheers, Stephen Rothwell