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 S1752959AbbDGLmV (ORCPT <rfc822;w@1wt.eu>);
	Tue, 7 Apr 2015 07:42:21 -0400
Received: from mail-wi0-f180.google.com ([209.85.212.180]:34363 "EHLO
	mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751075AbbDGLmS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 7 Apr 2015 07:42:18 -0400
Message-ID: <5523C296.9090508@dev.mellanox.co.il>
Date: Tue, 07 Apr 2015 14:42:14 +0300
From: Ido Shamay <idos@dev.mellanox.co.il>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>, netdev@vger.kernel.org
CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Jack Morgenstein <jackm@dev.mellanox.co.il>,
        Ido Shamay <idos@mellanox.com>, Or Gerlitz <ogerlitz@mellanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree
References: <20150407131819.269e593a@canb.auug.org.au>
In-Reply-To: <20150407131819.269e593a@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 4/7/2015 6:18 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/cmd.c between commit fde913e25496
> ("net/mlx4_core: Fix error message deprecation for ConnectX-2 cards")
> from the net tree and commit a130b5905732 ("net/mlx4: Add SET_PORT
> opcode modifiers enumeration") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.