From patchwork Sun Mar  6 23:14:36 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12770952
X-Patchwork-Delegate: kuba@kernel.org
Return-Path: <netdev-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D3680C433F5
	for <netdev@archiver.kernel.org>; Sun,  6 Mar 2022 23:14:46 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233070AbiCFXPh (ORCPT <rfc822;netdev@archiver.kernel.org>);
        Sun, 6 Mar 2022 18:15:37 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48154 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230331AbiCFXPg (ORCPT
        <rfc822;netdev@vger.kernel.org>); Sun, 6 Mar 2022 18:15:36 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BA7323BF9;
        Sun,  6 Mar 2022 15:14:42 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4KBcqd2hTvz4xvS;
        Mon,  7 Mar 2022 10:14:36 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1646608477;
        bh=aEQWMqXdoCOIPAGzph08yIKzBRNDLEBPjztdvdKgsxI=;
        h=Date:From:To:Cc:Subject:From;
        b=da4/zggK4h0oxQLkbp+BpzP6JTFgUvdgJscjxkUoAMfSGLahGu7I4l/gmaIW+ZXcC
         6WqfFZ9got+GeFy9Str5JVyp0eL+ddGXdGT+PMsxYpSr6ZE8p0AHdRRyQxGiZl8zAC
         b1dvxSCYGJCK3+lbk3V4/wIwwaJFAv5p61DnFQucF4XA5xMrlIMt2oo9dGZvKg7TzC
         dhoNwbxjq1vO6UCsaIOL6f5fLHjwrPn4rrWqOHJt1tMhsOGMwOLxE+RuwHyz3ulEOT
         6L//q4SQvyrMeFWYNwmkEO2olPO7DWpLYYWAhrLaB6yHpbzLMQHiHkxaOe3yb7mZTG
         ERMXk9axjWqzg==
Date: Mon, 7 Mar 2022 10:14:36 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Ansuel Smith <ansuelsmth@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20220307101436.7ae87da0@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/dsa/dsa2.c

between commit:

  afb3cc1a397d ("net: dsa: unlock the rtnl_mutex when dsa_master_setup() fails")

from the net tree and commit:

  e83d56537859 ("net: dsa: replay master state events in dsa_tree_{setup,teardown}_master")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/dsa/dsa2.c
index 074e4a69a728,d5f21a770689..000000000000
--- a/net/dsa/dsa2.c