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

Andrea Mayer
2026-04-09T01:05:29Z

On Wed, 8 Apr 2026 18:00:50 +0100
Mark Brown <broonie@kernel.org> 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