From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Lunn <andrew@lunn.ch>
Subject: Re: mv643xx_eth.c merge gone bad...
Date: Mon, 31 Oct 2016 14:35:38 +0100
Message-ID: <20161031133538.GB9441@lunn.ch>
References: <20161031113349.GA8951@lunn.ch>
 <20161031.091206.236633139585216348.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: jgunthorpe@obsidianresearch.com, jarod@redhat.com,
        netdev@vger.kernel.org
To: David Miller <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from vps0.lunn.ch ([178.209.37.122]:58663 "EHLO vps0.lunn.ch"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S942988AbcJaNfr (ORCPT <rfc822;netdev@vger.kernel.org>);
        Mon, 31 Oct 2016 09:35:47 -0400
Content-Disposition: inline
In-Reply-To: <20161031.091206.236633139585216348.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Mon, 31 Oct 2016 12:33:49 +0100
> 
> > The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for
> > mv643xx_eth.c has gone bad:
> 
> Sorry this should be fixed now.

Hi David

I think the SET_NETDEV_DEV() should be removed, which is what cause the merged conflict:

http://patchwork.ozlabs.org/patch/687294/

	Andrew