Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dcbx.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/hyperv/hyperv_net.h
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc fs/proc/proc_sysctl.c
Simple merge

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

diff --cc include/linux/qed/qed_if.h
Simple merge

diff --cc include/net/gre.h
Simple merge

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

diff --cc kernel/bpf/verifier.c
index 0cc46f1,daea765..abb61f3
--- 1/kernel/bpf/verifier.c
--- 2/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -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:
@@@ -1101,8 -1075,7 +1101,8 @@@
                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

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc samples/bpf/bpf_helpers.h
Simple merge