| Message ID | 20231206110306.01e91114@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/ethernet/stmicro/stmmac/dwmac5.c index 8fd167501fa0,ea92650f5c97..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac5.h index 34e620790eb3,8b0f2c90faef..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index a74e71db79f9,f33f73de5cfe..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c diff --cc drivers/net/ethernet/stmicro/stmmac/hwif.h index 68aa2d5ca6e5,72412d733856..000000000000 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/net/ethernet/stmicro/stmmac/dwmac5.c drivers/net/ethernet/stmicro/stmmac/dwmac5.h drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c drivers/net/ethernet/stmicro/stmmac/hwif.h between commit: 37e4b8df27bc ("net: stmmac: fix FPE events losing") from the net tree and commit: c3f3b97238f6 ("net: stmmac: Refactor EST implementation") 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.