Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 May 2016 04:52:29 +0000 (00:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 May 2016 04:52:29 +0000 (00:52 -0400)
commitcba653210056cf47cc1969f831f05ddfb99ee2bd
tree92d93a3eee5b12d77af3696b9da8026e71df5752
parent26879da58711aa604a1b866cbeedd7e0f78f90ad
parent7391daf2ffc780679d6ab3fad1db2619e5dd2c2a
Merge git://git./linux/kernel/git/davem/net

Conflicts:
net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
29 files changed:
MAINTAINERS
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/nes/nes_nic.c
drivers/net/dsa/mv88e6xxx.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt.h
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/wireless/intel/iwlwifi/iwl-8000.c
drivers/net/wireless/intel/iwlwifi/iwl-drv.c
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
include/linux/bpf.h
include/linux/mlx5/device.h
include/linux/net.h
include/linux/netdevice.h
include/net/vxlan.h
kernel/bpf/verifier.c
kernel/events/core.c
net/core/dev.c
net/ipv4/inet_hashtables.c
net/ipv4/ip_gre.c
net/ipv6/ila/ila_lwt.c
net/mac80211/iface.c
net/sched/sch_netem.c
net/tipc/node.c