| Message ID | 20230207101951.21a114fa@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | linux-next: manual merge of the bpf-next tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc drivers/net/ethernet/intel/ice/ice_main.c index 433298d0014a,074b0e6d0e2d..000000000000 --- a/drivers/net/ethernet/intel/ice/ice_main.c
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: drivers/net/ethernet/intel/ice/ice_main.c between commit: 5b246e533d01 ("ice: split probe into smaller functions") from the net-next tree and commit: 66c0e13ad236 ("drivers: net: turn on XDP features") from the bpf-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.