| Message ID | 20230406104927.45d176f5@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 |
On Thu, 6 Apr 2023 10:49:27 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/google/gve/gve.h > > between commit: > > 3ce934558097 ("gve: Secure enough bytes in the first TX desc for all TCP pkts") > > from the net tree and commit: > > 75eaae158b1b ("gve: Add XDP DROP and TX support for GQI-QPL format") > > from the net-next tree. I fixed the conflict in net-next but Praveen, Shailend - one of you called the constant MIN and the other one MAX. So which one is it? Please send a patch to net-next which removes one of them and uses the other consistently, they seem to serve the same purpose.
diff --cc drivers/net/ethernet/google/gve/gve.h index 005cb9dfe078,e214b51d3c8b..000000000000 --- a/drivers/net/ethernet/google/gve/gve.h
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/google/gve/gve.h between commit: 3ce934558097 ("gve: Secure enough bytes in the first TX desc for all TCP pkts") from the net tree and commit: 75eaae158b1b ("gve: Add XDP DROP and TX support for GQI-QPL format") from the net-next tree. Matthieu, thanks for the head up. 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.