lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230406120441.1276ef49@kernel.org> Date: Thu, 6 Apr 2023 12:04:41 -0700 From: Jakub Kicinski <kuba@...nel.org> To: Praveen Kaligineedi <pkaligineedi@...gle.com>, Shailend Chand <shailend@...gle.com> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, Networking <netdev@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Matthieu Baerts <matthieu.baerts@...sares.net>, Willem de Bruijn <willemb@...gle.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree 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.
Powered by blists - more mailing lists