Subject: Re: linux-next: manual merge of the net-next tree with the net tree

From: Jakub Kicinski <[email-masked]>
Date: Thu, 6 Apr 2023 12:04:41 -0700

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.