| Message ID | 20240813104039.429b9fe6@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| 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 drivers/net/dsa/vitesse-vsc73xx-core.c index e3f95d2cc2c1,a82b550a9e40..000000000000 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/dsa/vitesse-vsc73xx-core.c between commits: 5b9eebc2c7a5 ("net: dsa: vsc73xx: pass value in phy_write operation") fa63c6434b6f ("net: dsa: vsc73xx: check busy flag in MDIO operations") from the net tree and commit: 2524d6c28bdc ("net: dsa: vsc73xx: use defined values in phy operations") 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.