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

Merge 'skb-meta-dynptr' branch into 'master' branch. No conflict.

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

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge