git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 8 Mar 2016 17:34:12 +0000 (12:34 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 8 Mar 2016 17:34:12 +0000 (12:34 -0500)
commit	810813c47a564416f6306ae214e2661366c987a7
tree	f0d1f856d4b0024324f642fe519963248828b83f	tree \| snapshot
parent	d66ab51442211158b677c2f12310c314d9587f74	commit \| diff
parent	e2857b8f11a289ed2b61d18d0665e05c1053c446	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

56 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/3com/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/thunder/nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/linux/stmmac.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_metrics.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history
net/sctp/proc.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/subscr.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/3com/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/thunder/nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/ravb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/of/of_mdio.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/linux/stmmac.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_metrics.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history
net/sctp/proc.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/subscr.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history