From: Andrew Lunn <andrew@lunn.ch>
To: David Miller <davem@davemloft.net>,
jgunthorpe@obsidianresearch.com, jarod@redhat.com
Cc: netdev <netdev@vger.kernel.org>
Subject: mv643xx_eth.c merge gone bad...
Date: Mon, 31 Oct 2016 12:33:49 +0100 [thread overview]
Message-ID: <20161031113349.GA8951@lunn.ch> (raw)
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->min_mtu = 64;
+ dev->max_mtu = 9500;
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
+
++=======
++>>>>>>> 2a26d99b251b8625d27aed14e97fc10707a3a81f
if (mp->shared->win_protect)
wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);
Andrew
next reply other threads:[~2016-10-31 11:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 11:33 Andrew Lunn [this message]
2016-10-31 13:12 ` mv643xx_eth.c merge gone bad David Miller
2016-10-31 13:35 ` Andrew Lunn
2016-10-31 14:34 ` David Miller
2016-10-31 18:18 ` Florian Fainelli
2016-10-31 18:22 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031113349.GA8951@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=jarod@redhat.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).