From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BA2C1DDA24 for ; Tue, 8 Jul 2025 19:50:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752004215; cv=none; b=ehoRBGQR7+O3rJQSHP53/v4dAQQnAIPnOrgbY2ZMywqVU9PlCOYZrHqHtVJ+TAif6Ne26FODFFqjqi0lBwJBFDZWH+7AfrgdE43mcYlRAjLcQX65TbanfanOifrFogTU0MCvfVbDJ+1GEtS+pds/8lXBLTc0YoQBrE7WracMFKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752004215; c=relaxed/simple; bh=Y0iXoUqOLs0llj8Kqny8AlCcLxbD6abRir5vykfWqaE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=t/vCWPB8fsicPIHm5NQqClhJzAzt3u2kBqrz5mC1tmkRLOzFkmE9Nap54KgLsFK8nRrBeXcTKxbkW+I9SwqhwtGELymxdtN/LHDFJzDslEuoxAWivnZyxr7BnmfyIhUgwSgRUVRRETlpcBh8CjyCZ92a579G4mnU2raMyaIxhOI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=acaZgnYj; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="acaZgnYj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752004213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=LikuVg883RBnSofMj2iv/RfyoEWwYa7j+D9dFy02hRA=; b=acaZgnYjSQYldoe0kl+GmPtgv9mVlZkx07qTAiHqHZQfDA90f9DsyG4BZuYDNmOKGXeG2q a3VDhYBUVsbTVY4N6s5yxH3VwSjye0s9R6EhDTI16HBh5Xh+Whpq3i38yAbTjUJ7mfv3es HCGc1byXU6BHluZM9hpEuhT4bpeuLNg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553--uP6ZyJwP42Z576lEhfW3g-1; Tue, 08 Jul 2025 15:50:10 -0400 X-MC-Unique: -uP6ZyJwP42Z576lEhfW3g-1 X-Mimecast-MFC-AGG-ID: -uP6ZyJwP42Z576lEhfW3g_1752004210 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3af3c860ed7so2198775f8f.1 for ; Tue, 08 Jul 2025 12:50:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752004209; x=1752609009; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LikuVg883RBnSofMj2iv/RfyoEWwYa7j+D9dFy02hRA=; b=ffCjJIEbOoC5vqeeXrZC9IKc7D+cH0m+6tMWLVOVyCNpzM6HJn5McDVYvXvApvUQ9R qcn5mdvTA2/n8MdY95Ph116JFRzq4e8Kbo5OVCe31/N1MmFj6tgYRiBOZNAWBZ8imihx JCnAdzrvDSn4DNtLkS9no20zltQbjdYFquDvHYzRmfu7gB26O33U257hBRuPcG2We9Pu JQeS+BkFci6yp0L+wNUaNr2he/r3iY4KtxSeG15S+5vQ5O9Xc0qSBm52huod/HZb2RCb zehT6iYMgemJbeSK1dUo9L6Dlz4ihhS7TvxPKv/Myhe8DrzJekWnCbEAY7uln2PQQbGA bQcA== X-Forwarded-Encrypted: i=1; AJvYcCXmjaLTt+D3evhp1H2QZdE6c/x8lm0aFLVoJVYnoCSlG+B6daMOax5VCoh8DHOi9v5lTCjrLwc=@vger.kernel.org X-Gm-Message-State: AOJu0YxUhclT5Q+fuiwZaJvnhrEc/Q9USyoD3s4ZF5Y+r102CCQPDDAp zpQ/jEHxhE6DhHoKCBQGIyFfSPTv9Sxm896hxQigqcyaXvhpVNqIzkCv3Mo19JHHI8YVLzECsA8 +ZmwCU7aubhpK2fM00c1XC9WqbS2xKdc/oxmtlQ5YmUe7k0lMySr2iGDFdg== X-Gm-Gg: ASbGnctcOeZ9HzPY5AgsznFwZo3heOrnCvYk4h8LvCMrNvljZye4A5PlLYZi+RU+qEP YJFcN55lJrBs0SAiqTbXmgKV3eHsGM3lZljGcTp3KBBDy1ax1ZPRZr3ln+VJGilFpNP9LLF5sxT YzdjlGgLT/QSvEYHx/2oap7SKefWGeX28vDWGvAUkUuGhSlBWO57B00/yBLWqU/FxsOBfgaz5cs xWYbVyNYM4vPZcRN9lwnSvwI7XlIuFFiT8NFtrOTLb9VIiYB6i/lzx/A1bRHHhCFsrSowmLrt2J o7Jeolsq6h6j9ZM= X-Received: by 2002:a5d:5d0e:0:b0:3a4:f35b:d016 with SMTP id ffacd0b85a97d-3b497011a15mr15320227f8f.11.1752004209401; Tue, 08 Jul 2025 12:50:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1jBraagOsk3QI107z1D1hHowlYV/qp00H/NJFxbB801oXkh53Lpf4M+P4ApVMlSTE/u2Aig== X-Received: by 2002:a5d:5d0e:0:b0:3a4:f35b:d016 with SMTP id ffacd0b85a97d-3b497011a15mr15320197f8f.11.1752004208849; Tue, 08 Jul 2025 12:50:08 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:150d:fc00:de3:4725:47c6:6809]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454cd49e64dsm30477795e9.34.2025.07.08.12.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jul 2025 12:50:07 -0700 (PDT) Date: Tue, 8 Jul 2025 15:50:04 -0400 From: "Michael S. Tsirkin" To: Paolo Abeni Cc: Jakub Kicinski , netdev@vger.kernel.org, Willem de Bruijn , Jason Wang , Andrew Lunn , "David S. Miller" , Eric Dumazet , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , Yuri Benditovich , Akihiko Odaki , Jonathan Corbet , kvm@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v7 net-next 0/9] virtio: introduce GSO over UDP tunnel Message-ID: <20250708154718-mutt-send-email-mst@kernel.org> References: <20250708105816-mutt-send-email-mst@kernel.org> <20250708082404.21d1fe61@kernel.org> <20250708120014-mutt-send-email-mst@kernel.org> <27d6b80a-3153-4523-9ccf-0471a85cb245@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Jul 08, 2025 at 07:00:19PM +0200, Paolo Abeni wrote: > On 7/8/25 6:43 PM, Paolo Abeni wrote: > > On 7/8/25 6:00 PM, Michael S. Tsirkin wrote: > >> 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@github.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@github.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. > > > > I actually messed a bit with my proposal, as I forgot I need to use a > > common ancestor for the branches I shared. > > > > git@github.com:pabeni/linux-devel.git virtio_features_extension_07_07_2025 > > > > is based on current net-next and pulling from such tag will take a lot > > of unwanted stuff into the vhost tree. > > > > @Michael: AFAICS the current vhost devel tree is based on top of > > v6.15-rc7, am I correct? > > Which in turn means that you rebase your tree (before sending the PR to > Linus), am I correct? If so we can't have stable hashes shared between > net-next and vhost. > > /P We can, I can merge your tree after rebasing. It's a hassle if I rebase repeatedly but I've been known to do it. If this is what you want, pls just base on some recent RC by Linus. -- MST