Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Aug 2016 05:17:32 +0000 (01:17 -0400)
Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/hyperv/hyperv_net.h
drivers/net/hyperv/netvsc.c
drivers/net/hyperv/netvsc_drv.c
fs/proc/proc_sysctl.c
include/linux/netdevice.h
include/linux/qed/qed_if.h
include/net/gre.h
include/uapi/linux/bpf.h
kernel/bpf/verifier.c
net/core/dev.c
net/ipv6/ip6_gre.c
samples/bpf/bpf_helpers.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0cc46f1df358bfaa7e1b16fd5d2811308e6213ce,daea765d72e6f536c31b14bb569208b0e975b75c..abb61f3f69005bdf3870106fdc85742f40d32a24
@@@ -1078,8 -1053,7 +1078,8 @@@ static int check_map_func_compatibility
                        goto error;
                break;
        case BPF_MAP_TYPE_CGROUP_ARRAY:
-               if (func_id != BPF_FUNC_skb_in_cgroup &&
 -              if (func_id != BPF_FUNC_skb_under_cgroup)
++              if (func_id != BPF_FUNC_skb_under_cgroup &&
 +                  func_id != BPF_FUNC_current_task_under_cgroup)
                        goto error;
                break;
        default:
                if (map->map_type != BPF_MAP_TYPE_STACK_TRACE)
                        goto error;
                break;
-       case BPF_FUNC_skb_in_cgroup:
 +      case BPF_FUNC_current_task_under_cgroup:
+       case BPF_FUNC_skb_under_cgroup:
                if (map->map_type != BPF_MAP_TYPE_CGROUP_ARRAY)
                        goto error;
                break;
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge