On 02/24/2016 10:24 PM, David Miller wrote: [...]
Applied to 'net', thanks Daniel.
Thanks! Btw, in case net gets merged into net-next, there will be a minor merge conflict due to stackid flags present in net-next. This can be easily resolved by keeping both chunks. For example, result after merge in include/uapi/linux/bpf.h then looks like: /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */ #define BPF_F_TUNINFO_IPV6 (1ULL << 0) /* BPF_FUNC_skb_set_tunnel_key flags. */ #define BPF_F_ZERO_CSUM_TX (1ULL << 1) /* BPF_FUNC_get_stackid flags. */ #define BPF_F_SKIP_FIELD_MASK 0xffULL #define BPF_F_USER_STACK (1ULL << 8) #define BPF_F_FAST_STACK_CMP (1ULL << 9) #define BPF_F_REUSE_STACKID (1ULL << 10) Thanks, Daniel
