The patch will not break build for a tree that lacks the 'Fixes' commit, so this can also go in via staging tree.
OTOH, net-next build is broken for mips/octeon, so I think in this case net-next might make more sense?

drivers/staging/octeon/ethernet-tx.c +1 -2

index df3441b815bb..317c9720467c 100644
@@ -359,8 +359,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 	dst_release(skb_dst(skb));
 	skb_dst_set(skb, NULL);
 #ifdef CONFIG_XFRM
-	secpath_put(skb->sp);
-	skb->sp = NULL;
+	secpath_reset(skb);
 #endif
 	nf_reset(skb);

Signature · 1 line

2.19.2

Sergei Shtylyov

2018-12-22 08:35 UTC #1 lore raw

Hello!

Quoted 1 line · Florian Westphal

skb->sp doesn't exist anymore in the next-next tree, so mips defconfig

It's net-next. :-)

Quoted 8 lines

no longer builds. Use helper instead to reset the secpath.
Not even compile tested.
Cc Greg Kroah-Hartman <[email protected]>
Reported-by Guenter Roeck <[email protected]>
Fixes 4165079ba328d ("net: switch secpath to use skb extension infrastructure")
Signed-off-by Florian Westphal <[email protected]>

[...]

MBR, Sergei

David Miller

maintainer

2018-12-24 17:58 UTC #2 lore raw

In reply to Florian Westphal

From: Florian Westphal <[email protected]>
Date: Fri, 21 Dec 2018 21:57:26 +0100

Quoted 9 lines

skb->sp doesn't exist anymore in the next-next tree, so mips defconfig no longer builds. Use helper instead to reset the secpath.
Not even compile tested.
Cc Greg Kroah-Hartman <[email protected]>
Reported-by Guenter Roeck <[email protected]>
Fixes 4165079ba328d ("net: switch secpath to use skb extension infrastructure")
Signed-off-by Florian Westphal <[email protected]>

Quoted 7 lines

---
Greg, David:
The patch will not break build for a tree that lacks the 'Fixes' commit, so this can also go in via staging tree.
OTOH, net-next build is broken for mips/octeon, so I think in this case net-next might make more sense?

Yeah I agree, that net-next is probably the best place for this.

Because I know that Linus is sensitive to situations where he is sent a pull request, and then what he pulls doesn't match the pull request shortlog etc. I have asked him how he would let me handle this.

That's the only reason I haven't integrated this yet.

Just FYI!