Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Mark Brown <broonie@kernel.org>
CC:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree
Thread-Topic: linux-next: manual merge of the net-next tree with the net tree
Thread-Index: AQHXh9yVdl8lK4R1wkyVts+VWcD2T6tgqvsA
Date:   Mon, 2 Aug 2021 20:31:21 +0000
Message-ID: <20210802203120.t6yobpb6r7kro2c5@skbuf>
References: <20210802202531.40356-1-broonie@kernel.org>
In-Reply-To: <20210802202531.40356-1-broonie@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4t6FeiBsWe+0bGUU1yyHYulOG6qbMZN3KMo0K0k3QhSimVWO2q4F+NE5xJlu?=
 =?us-ascii?Q?eZ60MqGV3nD4T6Sv3ppT8cHq4/K6l3F9j1Vw3nc8PlfOkx5ZAhMo+I/lO9RV?=
 =?us-ascii?Q?sZLBlQv7i9YkpfFOUbrjEFR3Vvv6vZFKmGq2aBFeiQI2aBoPEAPgqozzRPTT?=
 =?us-ascii?Q?Q2BD5ytX676TdINFOM+noHUneIeHBUVcU5h7HuYmoqfL4Z5ZTxMkhfE8KB8F?=
 =?us-ascii?Q?T2IF4ZzerlBzAs1jD+ogCLJW3wvxytpgHVo9qWyuCIPP4HM8ZcH7/CbbNbYV?=
 =?us-ascii?Q?x+/2ahiCdrDtkvJb/NUMBn+b3iXPBuBVmmb2gKWc6LVmeZ3eTIoH//7iW90v?=
 =?us-ascii?Q?xsQii17Czz9ug71TqoubL8/MroPWa3yUtlyZrgmC1lJBDsL5/bdRSQKQ3vmD?=
 =?us-ascii?Q?dRa3ledQHmJdgt94aoC/jYZR8RH5JLPCx3Pk+R1Ups7BW//f6RagTYvQBs3H?=
 =?us-ascii?Q?jobY8XnEvYdjf3yEa/kI/eEjruIq7qMv0xRVB3bOn0QPanz5lICMgJJr4P67?=
 =?us-ascii?Q?6WhBoBgzt1GLto02hF5vs1Sc/f5i3+tlRkSbB+CnjE0gWRQETPoKMYJsKpvv?=
 =?us-ascii?Q?LkOkTOw9by7TrbU3QBePCaLfPqtXYLPM3BiLnlYubOozGkTbSMIgR1YIjBoA?=
 =?us-ascii?Q?SP7psvJxHJnq4DKBYwFzLsCU12+FE6gY2sI1rr+7cU9YNg3hbD0Eny6k/HZd?=
 =?us-ascii?Q?d2V+4L7U49S7MOFJeCDxBGjeh/mpY79c/w5VESEY/zOAjw3dqobyjo6CIa6T?=
 =?us-ascii?Q?sV4qOq0ypn+e3Pthpz1xpO/ZfU7oSCki3b7HRiSn6DfbkhqmMFkTbU6T68F7?=
 =?us-ascii?Q?3gex8PR4p5BRA9dZXdN9HM0hT/YG1ZDAUr+kg4JVej+kUuGdCt94LGn0w++l?=
 =?us-ascii?Q?m4ILgNk2n7PA16lf9lVOzG6U3X1YDf/s5QtoU9TA874d7nCkcxD6LVduLFXR?=
 =?us-ascii?Q?6Ii3e4Mmita4nLyaa8QMaAo+qMR1GvDDlZMRz32Xi7IPLiPo3B0Grz0YFtsM?=
 =?us-ascii?Q?Zp1DEGhgouW5J8JJfLoGFvn0iv7p+p0tetGEkfjX6eihl2uJtgxlCrD2PeLi?=
 =?us-ascii?Q?9KWVVXSK5XONWpwhivJqrMXKfcqwf3oSXGJEtKvabVQ6ZFB1N5SfBt6571+c?=
 =?us-ascii?Q?g4hMRBfbQELNr7QuSYhIXLPg3yn2Egv1KzoEtjhpi4bx1vrl/FJAln/ZcvcD?=
 =?us-ascii?Q?RMmv/H1C95LMLl8enUh0z68wdKINQkOskDHxyZuHCTf26SNx3Ct8EX78NKul?=
 =?us-ascii?Q?RBya+brT2tiudJkgI8TWCrMCIvcbWiaOR47bDPFjbhG7b1TN+m8kSEw3hbbW?=
 =?us-ascii?Q?MXSMt/WuqJ296NoORXaElMHR?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-ID: <E116F9721EFEAD46AC751002D5889F28@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 24c5d209-4239-421c-65e7-08d955f47d45
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2021 20:31:21.0347
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 9U0b6RV0YtIRHeXzlVvQ0aQ2RMQAdBsnEK/v5OWW7APPwZsQVEsR566fvZd9okY/kCwtw9PiHHNPSGJ1JDrFog==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2512
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 SJA1=
105P/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").=