[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20200309.185910.831951812430142688.davem@davemloft.net>
Date: Mon, 09 Mar 2020 18:59:10 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: olteanv@...il.com
Cc: horatiu.vultur@...rochip.com, alexandre.belloni@...tlin.com,
andrew@...n.ch, f.fainelli@...il.com, vivien.didelot@...il.com,
joergen.andreasen@...rochip.com, allan.nielsen@...rochip.com,
claudiu.manoil@....com, netdev@...r.kernel.org,
UNGLinuxDriver@...rochip.com, alexandru.marginean@....com,
xiaoliang.yang_1@....com, yangbo.lu@....com
Subject: Re: [PATCH net] net: mscc: ocelot: properly account for VLAN
header length when setting MRU
From: Vladimir Oltean <olteanv@...il.com>
Date: Tue, 10 Mar 2020 03:30:26 +0200
> When you merge net into net-next you can use this patch as reference
> for the conflict resolution, since it is going to conflict with
> 69df578c5f4b ("net: mscc: ocelot: eliminate confusion between CPU and
> NPI port") - both rename some variables.
Ok, thanks for letting me know.
Powered by blists - more mailing lists