Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 24 May 2014 04:32:30 +0000 (00:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 May 2014 04:32:30 +0000 (00:32 -0400)
commit54e5c4def0614ab540fbdf68e45342a4af141702
tree95a2f61c72336932e83d9e4180cd9739106d624b
parentbe65de7174123e02477bd488db1a657caf0f9947
parent1ee1ceafb572f1a925809168267a7962a4289de8
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/bonding/bond_alb.c
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
51 files changed:
Documentation/networking/filter.txt
MAINTAINERS
arch/arm/boot/dts/am33xx.dtsi
arch/x86/net/bpf_jit_comp.c
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_options.c
drivers/net/bonding/bonding.h
drivers/net/can/c_can/c_can.c
drivers/net/ethernet/altera/altera_sgdma.c
drivers/net/ethernet/altera/altera_tse_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/mellanox/mlx4/cmd.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/macvlan.c
drivers/net/phy/phy_device.c
drivers/net/wireless/iwlwifi/mvm/coex.c
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/utils.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/xen-netback/interface.c
include/linux/if_vlan.h
include/linux/netdevice.h
include/net/ip6_route.h
include/uapi/linux/audit.h
include/uapi/linux/nl80211.h
net/8021q/vlan_dev.c
net/batman-adv/distributed-arp-table.c
net/core/dev.c
net/core/net_namespace.c
net/core/rtnetlink.c
net/core/skbuff.c
net/ipv4/ip_tunnel.c
net/ipv4/route.c
net/ipv4/xfrm4_output.c
net/ipv6/ip6_output.c
net/ipv6/ip6_tunnel.c
net/ipv6/ip6_vti.c
net/ipv6/route.c
net/ipv6/xfrm6_output.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/sched/cls_tcindex.c