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>