Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge commit. Changes below are compared with the first parent: 314489bd.
Changes
38 files changed · +602 −376
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/networking/driver.txt
View fileDocumentation/networking/ip-sysctl.txt
View fileDocumentation/networking/netdevices.txt
View fileMAINTAINERS
View filearch/x86/net/bpf_jit.S
View filearch/x86/net/bpf_jit_comp.c
View filedrivers/net/bonding/bond_main.c
View filedrivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View filedrivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/intel/e1000e/e1000.h
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/intel/e1000e/netdev.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/marvell/sky2.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/realtek/r8169.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/phy/icplus.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/ppp/ppp_generic.c
View fileThis diff is incomplete. Download the complete patch.
fs/splice.c
View fileThis diff is incomplete. Download the complete patch.
include/linux/ethtool.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/netdevice.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/netfilter/xt_set.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/socket.h
View fileThis diff is incomplete. Download the complete patch.
include/net/netfilter/xt_log.h
View fileThis diff is incomplete. Download the complete patch.
net/core/dev.c
View fileThis diff is incomplete. Download the complete patch.
net/core/dev_addr_lists.c
View fileThis diff is incomplete. Download the complete patch.
net/core/filter.c
View fileThis diff is incomplete. Download the complete patch.
net/core/skbuff.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/mcast.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_core.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/xt_CT.c
View fileThis diff is incomplete. Download the complete patch.
net/netlink/af_netlink.c
View fileThis diff is incomplete. Download the complete patch.
net/phonet/pep.c
View fileThis diff is incomplete. Download the complete patch.
net/sctp/socket.c
View fileThis diff is incomplete. Download the complete patch.
net/socket.c
View fileThis diff is incomplete. Download the complete patch.