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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/google/gve/gve.h
index 005cb9dfe078,e214b51d3c8b..000000000000
--- a/drivers/net/ethernet/google/gve/gve.h
+++ b/drivers/net/ethernet/google/gve/gve.h
@@@ -47,8 -47,10 +47,12 @@@
  
  #define GVE_RX_BUFFER_SIZE_DQO 2048
  
 +#define GVE_GQ_TX_MIN_PKT_DESC_BYTES 182
 +
+ #define GVE_XDP_ACTIONS 5
+ 
+ #define GVE_TX_MAX_HEADER_SIZE 182
+ 
  /* Each slot in the desc ring has a 1:1 mapping to a slot in the data ring */
  struct gve_rx_desc_queue {
  	struct gve_rx_desc *desc_ring; /* the descriptor ring */