| Message ID | 20220307101436.7ae87da0@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc net/dsa/dsa2.c index 074e4a69a728,d5f21a770689..000000000000 --- a/net/dsa/dsa2.c
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.