| Message ID | 20241030120524.1ee1af18@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/intel/ice/ice_ptp_hw.h index 6cedc1a906af,656daff3447e..000000000000 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/intel/ice/ice_ptp_hw.h between commit: 6e58c3310622 ("ice: fix crash on probe for DPLL enabled E810 LOM") from the net tree and commits: e4291b64e118 ("ice: Align E810T GPIO to other products") ebb2693f8fbd ("ice: Read SDP section from NVM for pin definitions") ac532f4f4251 ("ice: Cleanup unused declarations") 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.