Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Jul 2013 21:50:41 +0000 (14:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Jul 2013 21:55:13 +0000 (14:55 -0700)
commit0c1072ae0242fbdffd9a0bba36e7a7033d287f9c
treee0f4dbdbf5078d4a707911177e7bdc17a70bdce5
parentc50cd357887acf9fd7af3a5d492911bd825555a2
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/renesas/sh_eth.c
net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>
35 files changed:
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/ethernet/marvell/pxa168_eth.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/renesas/sh_eth.h
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/stmicro/stmmac/common.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/davinci_cpdma.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/usb/qmi_wwan.c
drivers/net/wan/dlci.c
drivers/scsi/fcoe/fcoe.c
include/linux/if_vlan.h
include/linux/netdevice.h
include/linux/skbuff.h
net/core/dev.c
net/core/skbuff.c
net/core/sock.c
net/ipv4/gre_offload.c
net/ipv4/netfilter/ipt_ULOG.c
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/ipv6/ip6_output.c
net/netfilter/ipvs/ip_vs_core.c
net/netfilter/nf_conntrack_netlink.c