From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.uniroma2.it (smtp.uniroma2.it [160.80.4.37]) (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 1010C244684; Thu, 9 Apr 2026 01:05:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=160.80.4.37 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775696733; cv=none; b=mdqlb4XNhIZUCa9AAaDT/uOeNE/178z4v+VqnOF5FP7eh9RTYVPsSlhKDk6bYstd2HDnsDnpKEcBVFg1gzYz1u7vYX9YLySR21FDfrT1oxWePagN0Yx72gcK3HCKmeV/YH/MWtp7bJZm87i+5wYv5kHrwslgU0IxzpHQE6/AUZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775696733; c=relaxed/simple; bh=k1e80WLEIMZeQALBTIpzpMPH/HfGFZJ7DL8pjX+ONdE=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=XGcygNBuWSoXOVweToqpHOw55NGV82pQP/E1QH/Rn9lJkFgXsB8NLgOHolKHw8vCPFFb7kym8XUZVwf8IMT/iA8TrVo82Ad3xdUXN14hXP2ESo3UFcv6aJbOxP/rXh7fljGD40Wi/UFTNrXjs9/vzba6H1PCYYY5NK173BAy5lw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniroma2.it; spf=pass smtp.mailfrom=uniroma2.it; dkim=permerror (0-bit key) header.d=uniroma2.it header.i=@uniroma2.it header.b=vDhhOoRJ; dkim=pass (2048-bit key) header.d=uniroma2.it header.i=@uniroma2.it header.b=SvlkauuV; arc=none smtp.client-ip=160.80.4.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniroma2.it Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=uniroma2.it Authentication-Results: smtp.subspace.kernel.org; dkim=permerror (0-bit key) header.d=uniroma2.it header.i=@uniroma2.it header.b="vDhhOoRJ"; dkim=pass (2048-bit key) header.d=uniroma2.it header.i=@uniroma2.it header.b="SvlkauuV" Received: from smtpauth-2019-1.uniroma2.it (smtpauth-2019-1.uniroma2.it [160.80.5.46]) by smtp-2015.uniroma2.it (8.14.4/8.14.4/Debian-8) with ESMTP id 6391534o028424; Thu, 9 Apr 2026 03:05:09 +0200 Received: from lubuntu-18.04 (unknown [160.80.103.126]) by smtpauth-2019-1.uniroma2.it (Postfix) with ESMTPSA id 639121228CC; Thu, 9 Apr 2026 03:04:58 +0200 (CEST) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=uniroma2.it; s=ed201904; t=1775696699; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmHCsqc7WegKUOgUHHPM9TqWAh8MTHZ2YLN5cXh+lwE=; b=vDhhOoRJZn9dDUj8GdadWCYlz8rNbR376DyrWnbM6iW8S8/s2HA8xDhPBauChAwjpMzoja Fn8gyRecwZu+6hBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uniroma2.it; s=rsa201904; t=1775696699; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmHCsqc7WegKUOgUHHPM9TqWAh8MTHZ2YLN5cXh+lwE=; b=SvlkauuVYE//Yd/gAp51jA+lQpN9S6h+0Sst0z4fvvM5SXhJ2AHmYICMQ3SvCsGVWWiLch 2hfAcXZW88ccaJYTkQTuNgppJ9gKdJZpVnu8Eh7KZkS8F98YLnhYXDcpx6FgXYl3rt5d3V MAGZI1cSK1owbx4bfGEQPXC39vWpKjhPfqqQLndNX/XeS3DUYhNEMlqRxhXb8v35C34Ib7 rbBp4CQ2oZ3i5RRC8ZxFUYZ/P6FE1gh0oTojFWLC8HmDtLpMkQ0bWQPXvL1mk8GWyaT2Kx +PyqxQ/CyAgtpDoAymlmD7pLps4cY3xxdlZCq1B+oTqsrR9fsusUmdQ8f9daFQ== Date: Thu, 9 Apr 2026 03:04:57 +0200 From: Andrea Mayer To: Mark Brown , Matthieu Baerts Cc: David Miller , Jakub Kicinski , Paolo Abeni , Networking , Justin Iurman , Linux Kernel Mailing List , Linux Next Mailing List , Andrea Mayer Subject: Re: linux-next: manual merge of the net-next tree with the netfilter tree Message-Id: <20260409030457.a37c01254eb615b9b410e183@uniroma2.it> In-Reply-To: References: <729b748b-e00b-475e-81e0-a666eab24fc6@sirena.org.uk> <8d216893-1e0b-4e3c-8609-eb3de5da02cf@kernel.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) 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-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.100.0 at smtp-2015 X-Virus-Status: Clean On Wed, 8 Apr 2026 18:00:50 +0100 Mark Brown wrote: > On Wed, Apr 08, 2026 at 06:43:36PM +0200, Matthieu Baerts wrote: > > On 08/04/2026 17:08, Mark Brown wrote: > > > > This also needs a fixup for a new jump to the error handling paths that > > > was added in seg6_build_state(). > > > I also had this other conflict there, and I did this when resolving it > > in MPTCP tree: > > > + if (tb[SEG6_IPTUNNEL_SRC]) { > > + slwt->tunsrc = nla_get_in6_addr(tb[SEG6_IPTUNNEL_SRC]); > > + > > + if (ipv6_addr_any(&slwt->tunsrc) || > > + ipv6_addr_is_multicast(&slwt->tunsrc) || > > + ipv6_addr_loopback(&slwt->tunsrc)) { > > + NL_SET_ERR_MSG(extack, "invalid tunsrc address"); > > + err = -EINVAL; > > - goto free_dst_cache; > > ++ goto err_destroy_output; > > + } > > + } > > + > > Yes, that's the additional fixup I mentioned above - it didn't conflict > for me (well, the exit path did). Thanks Mark and Matthieu for taking care of this. I went through both commits and the rerere. The resolution looks correct from the seg6 side. Build-tested. Happy to help if anything else comes up. Cheers, Andrea