From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753689AbcAEUvg (ORCPT ); Tue, 5 Jan 2016 15:51:36 -0500 Received: from ozlabs.org ([103.22.144.67]:47836 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413AbcAEUvd (ORCPT ); Tue, 5 Jan 2016 15:51:33 -0500 Date: Wed, 6 Jan 2016 07:51:31 +1100 From: Stephen Rothwell To: Or Gerlitz Cc: Doug Ledford , David Miller , , , , Saeed Mahameed , Achiad Shochat , Matan Barak , Leon Romanovsky Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree Message-ID: <20160106075131.4f7f0608@canb.auug.org.au> In-Reply-To: <568BF7D4.8080304@mellanox.com> References: <20160105125154.36d9a0c4@canb.auug.org.au> <568BF7D4.8080304@mellanox.com> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) 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 Or, On Tue, 5 Jan 2016 19:05:24 +0200 Or Gerlitz wrote: > > On 1/5/2016 3:51 AM, Stephen Rothwell wrote: > > Hi Doug, > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > > drivers/net/ethernet/mellanox/mlx5/core/vport.c > > include/linux/mlx5/mlx5_ifc.h > > include/linux/mlx5/vport.h > > > > between commits: > > > > e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address") > > e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state") > > > > from the net-next tree and commit: > > > > e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function") > > > > from the rdma tree and maybe some others. > > > > I have no hope of fixing this stuff up, so I have dropped the rdma tree > > again for today. There is similar functionality being introduced in > > both trees ... please sort this mess out ... > > Hi Stephen, > > Saeed/Matan and Co are working here on a fix which would solve the > conflict. Wonderful. > We have the basic patch and people will be testing it later/tomorrow. > > Could you please advice how would it be possible to provide you the > git rerere output -- the pre-image and post-images files from .git/rr-cache? Just send me a (private) email (no need to bother the list) with the pre and post image files attached, thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au