| Message ID | 20230213102038.54cc9060@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| 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 |
Hi Stephen, On 13/02/2023 00:20, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/intel/ice/ice_xsk.c > > between commit: > > 1f090494170e ("ice: xsk: Fix cleaning of XDP_TX frames") > > from the net tree and commit: > > a24b4c6e9aab ("ice: xsk: Do not convert to buff to frame for XDP_TX") > > from the net-next tree. Thank you for having shared this patch! We had the same conflict on our side: Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net> Cheers, Matt
diff --cc drivers/net/ethernet/intel/ice/ice_xsk.c index 374b7f10b549,a25a68c69f22..000000000000 --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/intel/ice/ice_xsk.c between commit: 1f090494170e ("ice: xsk: Fix cleaning of XDP_TX frames") from the net tree and commit: a24b4c6e9aab ("ice: xsk: Do not convert to buff to frame for XDP_TX") 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.