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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

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

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

diff --cc kernel/events/core.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/fou.c
Simple merge

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

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mesh_hwmp.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/sta_info.h
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

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

diff --cc samples/bpf/Makefile
index 9959771,b820cc9..744dd7a
--- 1/samples/bpf/Makefile
--- 2/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -79,13 -75,9 +79,10 @@@ HOSTLOADLIBES_lathist += -lel
  HOSTLOADLIBES_offwaketime += -lelf
  HOSTLOADLIBES_spintest += -lelf
  HOSTLOADLIBES_map_perf_test += -lelf -lrt
 +HOSTLOADLIBES_test_overhead += -lelf -lrt
  
- # point this to your LLVM backend with bpf support
- LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc
- 
- # asm/sysreg.h inline assmbly used by it is incompatible with llvm.
- # But, ehere is not easy way to fix it, so just exclude it since it is
+ # asm/sysreg.h - inline assembly used by it is incompatible with llvm.
+ # But, there is no easy way to fix it, so just exclude it since it is
  # useless for BPF samples.
  $(obj)/%.o: $(src)/%.c
        clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \