From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755974AbcCPVPW (ORCPT <rfc822;w@1wt.eu>);
	Wed, 16 Mar 2016 17:15:22 -0400
Received: from vps0.lunn.ch ([178.209.37.122]:48919 "EHLO vps0.lunn.ch"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755778AbcCPVPS (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 16 Mar 2016 17:15:18 -0400
Date: Wed, 16 Mar 2016 22:15:03 +0100
From: Andrew Lunn <andrew@lunn.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
        Doug Ledford <dledford@redhat.com>, David Miller <davem@davemloft.net>,
        Network Development <netdev@vger.kernel.org>,
        linux-next <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Amir Vadai <amir@vadai.me>, Maor Gottlieb <maorg@mellanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree
Message-ID: <20160316211503.GA16382@lunn.ch>
References: <20160316115809.61b4478e@canb.auug.org.au>
 <CA+55aFzhYJxCOXER-mhOfJ6=V13Rb5F0LB_3A9n7S_dLkb8f0g@mail.gmail.com>
 <20160317075246.39a08e61@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160317075246.39a08e61@canb.auug.org.au>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Stephen

> 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

	Andrew