Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Mar 2022 10:14:36 +1100

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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/dsa/dsa2.c
index 074e4a69a728,d5f21a770689..000000000000
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@@ -1064,9 -1078,18 +1078,18 @@@ static int dsa_tree_setup_master(struc
  
  	list_for_each_entry(dp, &dst->ports, list) {
  		if (dsa_port_is_cpu(dp)) {
- 			err = dsa_master_setup(dp->master, dp);
+ 			struct net_device *master = dp->master;
+ 			bool admin_up = (master->flags & IFF_UP) &&
+ 					!qdisc_tx_is_noop(master);
+ 
+ 			err = dsa_master_setup(master, dp);
  			if (err)
 -				return err;
 +				break;
+ 
+ 			/* Replay master state event */
+ 			dsa_tree_master_admin_state_change(dst, master, admin_up);
+ 			dsa_tree_master_oper_state_change(dst, master,
+ 							  netif_oper_up(master));
  		}
  	}