Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Jun 2016 09:03:36 +0000 (05:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Jun 2016 09:03:36 +0000 (05:03 -0400)
commitee58b57100ca953da7320c285315a95db2f7053d
tree77b815a31240adc4d6326346908137fc6c2c3a96
parent6f30e8b022c8e3a722928ddb1a2ae0be852fcc0e
parente7bdea7750eb2a64aea4a08fa5c0a31719c8155d
Merge git://git./linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>
56 files changed:
MAINTAINERS
arch/arm/boot/dts/dra7.dtsi
drivers/net/can/dev.c
drivers/net/can/usb/gs_usb.c
drivers/net/ethernet/broadcom/bgmac.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/ethernet/qlogic/qed/qed_l2.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/qlogic/qed/qed_spq.c
drivers/net/ethernet/qlogic/qede/qede_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/geneve.c
drivers/net/phy/fixed_phy.c
drivers/net/team/team.c
drivers/net/usb/r8152.c
drivers/net/vxlan.c
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath10k/htt_rx.c
drivers/net/wireless/ath/ath10k/mac.c
include/linux/bpf.h
include/linux/mlx4/device.h
include/linux/qed/qed_eth_if.h
kernel/trace/bpf_trace.c
net/batman-adv/routing.c
net/core/filter.c
net/ipv4/gre_demux.c
net/ipv4/ip_gre.c
net/ipv4/tcp_output.c
net/ipv6/icmp.c
net/ipv6/route.c
net/ipv6/sit.c
net/ipv6/udp.c
net/openvswitch/conntrack.c
net/rds/ib_cm.c
net/rds/loop.c
net/rds/tcp_connect.c
net/rds/tcp_listen.c
net/rds/tcp_recv.c
net/rds/tcp_send.c
net/sched/act_api.c
net/sched/act_ife.c
net/sched/act_ipt.c
net/sched/sch_fifo.c
net/sched/sch_htb.c
net/sched/sch_netem.c
net/sched/sch_prio.c
net/tipc/bearer.c
net/tipc/link.c
tools/virtio/ringtest/Makefile