Re: linux-next: manual merge of the net-next tree with the net tree
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: 2021-08-02 20:31:28
Also in:
linux-next, lkml
Hello Mark, On Mon, Aug 02, 2021 at 09:25:31PM +0100, Mark Brown wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/dsa/sja1105/sja1105_main.c
between commit:
589918df9322 ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
from the net tree and commit:
0fac6aa098ed ("net: dsa: sja1105: delete the best_effort_vlan_filtering mode")
from the net-next tree.
The conflict resolution I intended (not the one you came up with) is
described in the commit message of patch 589918df9322 ("net: dsa:
sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too").