From: David S. Miller Date: Tue, 8 Mar 2016 18:58:52 +0000 (-0500) Subject: Merge branch 'bpf-next' X-Git-Tag: v4.6-rc1~91^2~113 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d24ad3fc0e454b4354acc10149ecceda445d6a75;p=linux-2.6-block.git Merge branch 'bpf-next' Daniel Borkmann says: ==================== BPF updates Couple of misc updates to BPF, besides others this series adds bpf_csum_diff() to be used with L3 csums, allows for managing tunnel options for collect meta data mode, and enabling ipv6 traffic class for collect meta data in vxlan specifically (geneve already supports it). For more details, please see individual patches. The series requires net to be merged into net-next first to avoid any further pending merge conflicts. ==================== Signed-off-by: David S. Miller --- d24ad3fc0e454b4354acc10149ecceda445d6a75