From mboxrd@z Thu Jan 1 00:00:00 1970 From: Or Gerlitz Subject: Re: linux-next: manual merge of the infiniband tree with Linus' tree Date: Tue, 26 Feb 2013 09:27:06 +0200 Message-ID: <512C63CA.3050004@mellanox.com> References: <20130226114508.0f8d1101156f9f4a309579f6@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: <20130226114508.0f8d1101156f9f4a309579f6@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Roland Dreier , linux-rdma@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hadar Hen Zion , David Miller , netdev@vger.kernel.org, Shani Michaeli , Haggai Eran , Amir Vadai List-Id: linux-next.vger.kernel.org On 26/02/2013 02:45, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the infiniband tree got a conflict in > drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d > ("net/mlx4_core: Use firmware driven flow steering hash mode") from > Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in > {INIT, QUERY}_HCA") from the infiniband tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > thanks, Acked-by: Or Gerlitz From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759710Ab3BZH1Z (ORCPT ); Tue, 26 Feb 2013 02:27:25 -0500 Received: from eu1sys200aog101.obsmtp.com ([207.126.144.111]:33120 "EHLO eu1sys200aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758887Ab3BZH1X (ORCPT ); Tue, 26 Feb 2013 02:27:23 -0500 Message-ID: <512C63CA.3050004@mellanox.com> Date: Tue, 26 Feb 2013 09:27:06 +0200 From: Or Gerlitz User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130215 Thunderbird/17.0.3 MIME-Version: 1.0 To: Stephen Rothwell CC: Roland Dreier , , , , Hadar Hen Zion , David Miller , , Shani Michaeli , Haggai Eran , Amir Vadai Subject: Re: linux-next: manual merge of the infiniband tree with Linus' tree References: <20130226114508.0f8d1101156f9f4a309579f6@canb.auug.org.au> In-Reply-To: <20130226114508.0f8d1101156f9f4a309579f6@canb.auug.org.au> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.222.66.109] X-TM-AS-Product-Ver: SMEX-10.0.0.4211-7.000.1014-19666.002 X-TM-AS-Result: No--4.546500-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26/02/2013 02:45, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the infiniband tree got a conflict in > drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d > ("net/mlx4_core: Use firmware driven flow steering hash mode") from > Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in > {INIT, QUERY}_HCA") from the infiniband tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > thanks, Acked-by: Or Gerlitz