]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'
authorMartin KaFai Lau <martin.lau@kernel.org>
Tue, 19 Aug 2025 00:58:21 +0000 (17:58 -0700)
committerMartin KaFai Lau <martin.lau@kernel.org>
Tue, 19 Aug 2025 00:58:21 +0000 (17:58 -0700)
Merge 'skb-meta-dynptr' branch into 'net' branch. No conflict.

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

Trivial merge