netdev - 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20161031113349.GA8951@lunn.ch>
Date:   Mon, 31 Oct 2016 12:33:49 +0100
From:   Andrew Lunn <andrew@...n.ch>
To:     David Miller <davem@...emloft.net>,
        jgunthorpe@...idianresearch.com, jarod@...hat.com
Cc:     netdev <netdev@...r.kernel.org>
Subject: mv643xx_eth.c merge gone bad...

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