Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Dec 2015 03:08:28 +0000 (22:08 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Dec 2015 03:08:28 +0000 (22:08 -0500)
commitb3e0d3d7bab14f2544a3314bec53a23dc7dd2206
tree2bd3c1c1d128e0c362655fa70a6eea02fc856f62
parent3268e5cb494d8778a5a67a9fa2b1bdb0243b77ad
parent73796d8bf27372e26c2b79881947304c14c2d353
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
53 files changed:
MAINTAINERS
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/apm/xgene/xgene_enet_main.h
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/cavium/thunder/nic_main.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40evf/i40evf_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/renesas/ravb_main.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/geneve.c
drivers/net/ppp/pppoe.c
drivers/net/ppp/pptp.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/r8152.c
drivers/net/virtio_net.c
include/linux/cgroup-defs.h
include/linux/cgroup.h
include/linux/netdevice.h
include/linux/rhashtable.h
include/linux/wait.h
include/net/sock.h
include/net/vxlan.h
kernel/cgroup.c
lib/rhashtable.c
net/batman-adv/routing.c
net/batman-adv/translation-table.c
net/core/netclassid_cgroup.c
net/core/netprio_cgroup.c
net/core/sock.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/addrconf.c
net/ipv6/ip6_gre.c
net/ipv6/tcp_ipv6.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c
net/mpls/af_mpls.c
net/mpls/mpls_iptunnel.c
net/sctp/socket.c
net/unix/af_unix.c
net/wireless/nl80211.c
net/wireless/reg.c