From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hadar Hen Zion Subject: Re: linux-next: manual merge of the net-next tree with the infiniband tree Date: Thu, 12 Jul 2012 15:59:11 +0300 Message-ID: <4FFECA1F.2020005@mellanox.com> References: <20120712120950.223be053857381046b7d5db6@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120712120950.223be053857381046b7d5db6@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jack Morgenstein , Roland Dreier , linux-rdma@vger.kernel.org, Hadar Hen Zion , Or Gerlitz List-Id: linux-next.vger.kernel.org On 7/12/2012 5:09 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3 > ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct > and paravirtualize them") from the infiniband tree and commit > 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware > API") from the net-next tree. > > Just context changes (I think). I have fixed it up (see below) and can > carry the fix as necessary. > Thanks Stephen. Please add: Acked-by: Hadar Hen Zion Hadar