| Message ID | 20221004121107.5dd88137@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Changes Requested |
| 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 drivers/net/ethernet/mediatek/mtk_ppe.c index 148ea636ef97,887f430734f7..000000000000 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mediatek/mtk_ppe.c between commit: ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear") from the net tree and commit: 9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc") 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.