]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'
authorMartin KaFai Lau <martin.lau@kernel.org>
Fri, 5 Sep 2025 04:22:00 +0000 (21:22 -0700)
committerMartin KaFai Lau <martin.lau@kernel.org>
Fri, 5 Sep 2025 04:22:00 +0000 (21:22 -0700)
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>

Trivial merge