netdev - Re: [PATCH v7 net-next 0/9] virtio: introduce GSO over UDP tunnel

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250708120014-mutt-send-email-mst@kernel.org>
Date: Tue, 8 Jul 2025 12:00:45 -0400
From: "Michael S. Tsirkin" <mst@...hat.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org,
	Willem de Bruijn <willemdebruijn.kernel@...il.com>,
	Jason Wang <jasowang@...hat.com>,
	Andrew Lunn <andrew+netdev@...n.ch>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
	Eugenio Pérez <eperezma@...hat.com>,
	Yuri Benditovich <yuri.benditovich@...nix.com>,
	Akihiko Odaki <akihiko.odaki@...nix.com>,
	Jonathan Corbet <corbet@....net>, kvm@...r.kernel.org,
	linux-doc@...r.kernel.org
Subject: Re: [PATCH v7 net-next 0/9] virtio: introduce GSO over UDP tunnel

On Tue, Jul 08, 2025 at 08:24:04AM -0700, Jakub Kicinski wrote:
> On Tue, 8 Jul 2025 11:01:30 -0400 Michael S. Tsirkin wrote:
> > > git@...hub.com:pabeni/linux-devel.git virtio_udp_tunnel_07_07_2025
> > > 
> > > The first 5 patches in this series, that is, the virtio features
> > > extension bits are also available at [2]:
> > > 
> > > git@...hub.com:pabeni/linux-devel.git virtio_features_extension_07_07_2025
> > > 
> > > Ideally the virtio features extension bit should go via the virtio tree
> > > and the virtio_net/tun patches via the net-next tree. The latter have
> > > a dependency in the first and will cause conflicts if merged via the
> > > virtio tree, both when applied and at merge window time - inside Linus
> > > tree.
> > > 
> > > To avoid such conflicts and duplicate commits I think the net-next
> > > could pull from [1], while the virtio tree could pull from [2].  
> > 
> > Or I could just merge all of this in my tree, if that's ok
> > with others?
> 
> No strong preference here. My first choice would be a branch based
> on v6.16-rc5 so we can all pull in and resolve the conflicts that
> already exist. But I haven't looked how bad the conflicts would 
> be for virtio if we did that. On net-next side they look manageable.


OK, let's do it the way Paolo wants then.

-- 
MST