netdev - Re: mv643xx_eth.c merge gone bad...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 31 Oct 2016 14:35:38 +0100
From:   Andrew Lunn <andrew@...n.ch>
To:     David Miller <davem@...emloft.net>
Cc:     jgunthorpe@...idianresearch.com, jarod@...hat.com,
        netdev@...r.kernel.org
Subject: Re: mv643xx_eth.c merge gone bad...

On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote:
> From: Andrew Lunn <andrew@...n.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