Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 May 2014 17:19:14 +0000 (13:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 May 2014 17:19:14 +0000 (13:19 -0400)
commit5f013c9bc70214dcacd5fbed5a06c217d6ff9c59
tree34c3a633000e03bca57d0ce55d8759f86edecc03
parent51ee42efa0829cf9e46f8e1c0ab7a9ab6facf3f2
parent1a466ae96e9f749d02a73315a3e66375e61a61dd
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
45 files changed:
MAINTAINERS
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am4372.dtsi
drivers/net/bonding/bond_sysfs.c
drivers/net/can/c_can/c_can_pci.c
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/intel/e1000e/ich8lan.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/macvlan.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/rt2x00/rt2x00mac.c
include/linux/netdevice.h
include/linux/netlink.h
include/net/cfg80211.h
kernel/audit.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_event.c
net/core/dev.c
net/ipv4/af_inet.c
net/ipv4/tcp_cubic.c
net/ipv4/tcp_output.c
net/ipv6/ip6_fib.c
net/mac80211/rx.c
net/mac80211/sta_info.c
net/mac80211/util.c
net/netfilter/nfnetlink.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
net/sctp/protocol.c
net/wireless/scan.c
net/wireless/sme.c