From: Martin KaFai Lau <martin.lau@kernel.org>
Date: Fri, 5 Sep 2025 04:10:13 +0000 (-0700)
Subject: Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/master'
X-Git-Tag: v6.18-rc1~175^2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9621eb635ba96514edd0fbfaeeec1fffea294abb;p=thirdparty%2Flinux.git

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

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

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

9621eb635ba96514edd0fbfaeeec1fffea294abb