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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

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

diff --cc drivers/net/ethernet/xilinx/xilinx_emaclite.c
Simple merge

diff --cc drivers/net/xen-netback/interface.c
Simple merge

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

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

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

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

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

diff --cc net/packet/af_packet.c
Simple merge

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

diff --cc tools/lib/bpf/bpf.c
Simple merge

diff --cc tools/lib/bpf/bpf.h
index 88f07c15423ab1c9b56494d3db6e8e35941384b8,4ac6c4b841001b86a58ae5e9ad72cda60d8a5814..9f838aa6d26ee004451c7da8afa0ee847013e7ab
--- 1/tools/lib/bpf/bpf.h
--- 2/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@@ -33,15 -33,16 +33,16 @@@ int bpf_load_program(enum bpf_prog_typ
                     __u32 kern_version, char *log_buf,
                     size_t log_buf_sz);
  
 -int bpf_map_update_elem(int fd, void *key, void *value,
 +int bpf_map_update_elem(int fd, const void *key, const void *value,
                        __u64 flags);
  
 -int bpf_map_lookup_elem(int fd, void *key, void *value);
 -int bpf_map_delete_elem(int fd, void *key);
 -int bpf_map_get_next_key(int fd, void *key, void *next_key);
 +int bpf_map_lookup_elem(int fd, const void *key, void *value);
 +int bpf_map_delete_elem(int fd, const void *key);
 +int bpf_map_get_next_key(int fd, const void *key, void *next_key);
  int bpf_obj_pin(int fd, const char *pathname);
  int bpf_obj_get(const char *pathname);
- int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type);
+ int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type,
+                   unsigned int flags);
  int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);