linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

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-prev] [day] [month] [year] [list]

Message-ID: <20210802203120.t6yobpb6r7kro2c5@skbuf>
Date:   Mon, 2 Aug 2021 20:31:21 +0000
From:   Vladimir Oltean <vladimir.oltean@....com>
To:     Mark Brown <broonie@...nel.org>
CC:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

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").