Re: mv643xx_eth.c merge gone bad...

2016-10-31 Thread Andrew Lunn
On Mon, Oct 31, 2016 at 11:18:54AM -0700, Florian Fainelli wrote: > On 10/31/2016 07:34 AM, David Miller wrote: > > From: Andrew Lunn > > Date: Mon, 31 Oct 2016 14:35:38 +0100 > > > >> On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote: > >>> From: Andrew Lunn > >>> Date: Mon, 31 Oct 2

Re: mv643xx_eth.c merge gone bad...

2016-10-31 Thread Florian Fainelli
On 10/31/2016 07:34 AM, David Miller wrote: > From: Andrew Lunn > Date: Mon, 31 Oct 2016 14:35:38 +0100 > >> On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote: >>> From: Andrew Lunn >>> Date: Mon, 31 Oct 2016 12:33:49 +0100 >>> The merge of commit 27058af401e49d88a905df000dd26f44

Re: mv643xx_eth.c merge gone bad...

2016-10-31 Thread David Miller
From: Andrew Lunn Date: Mon, 31 Oct 2016 14:35:38 +0100 > On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote: >> From: Andrew Lunn >> Date: Mon, 31 Oct 2016 12:33:49 +0100 >> >> > The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for >> > mv643xx_eth.c has gone bad: >> >>

Re: mv643xx_eth.c merge gone bad...

2016-10-31 Thread Andrew Lunn
On Mon, Oct 31, 2016 at 09:12:06AM -0400, David Miller wrote: > From: Andrew Lunn > 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_D

Re: mv643xx_eth.c merge gone bad...

2016-10-31 Thread David Miller
From: Andrew Lunn 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. Thanks.

mv643xx_eth.c merge gone bad...

2016-10-31 Thread Andrew Lunn
Hi Dave The merge of commit 27058af401e49d88a905df000dd26f443fcfa8ce for mv643xx_eth.c has gone bad: @@@ -3203,12 -3204,6 +3220,15 @@@ dev->priv_flags |= IFF_UNICAST_FLT; dev->gso_max_segs = MV643XX_MAX_TSO_SEGS; ++<<< HEAD + /* MTU range: 64 - 9500 */ + dev->mi