From: Martin KaFai Lau <martin.lau@kernel.org>
Date: Fri, 5 Sep 2025 04:22:00 +0000 (-0700)
Subject: Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'
X-Git-Tag: v6.18-rc1~132^2~73^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dfd8b8de66d9b0ef16d089e4d4525acf2a59cb2;p=thirdparty%2Flinux.git

Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'

Merge skb-meta-dynptr branch into net branch after fixing a compiler
warning. No conflict.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
---

2dfd8b8de66d9b0ef16d089e4d4525acf2a59cb2