]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ba19fc aa17779)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Mar 2014 01:32:02 +0000 (20:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Mar 2014 01:32:02 +0000 (20:32 -0500)
commitecf18a87ed5d105243f30442b70d4590e06edea7
treec83ac73e3d569156d4b7f3dab3e7e27e0054cd0dtree | snapshot
parent3ba19fc3d2322a319c2abf48ce5ef6a164c8cc75commit | diff
parentaa177792e6f17af53310e70761aa698d170176cccommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c
net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
59 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_3ad.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/bonding/bonding.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/tg3.c diff1 | diff2 | blob | history
drivers/net/ethernet/brocade/bna/bnad.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/veth.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/hw.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/recv.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/xmit.c diff1 | diff2 | blob | history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mvm.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/tx.c diff1 | diff2 | blob | history
drivers/net/wireless/libertas/cfg.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/pcie.c diff1 | diff2 | blob | history
drivers/net/wireless/mwifiex/wmm.c diff1 | diff2 | blob | history
drivers/net/xen-netfront.c diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/hsr/hsr_framereg.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.c diff1 | diff2 | blob | history
net/ipv4/tcp_cong.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/sit.c diff1 | diff2 | blob | history
net/mac80211/ieee80211_i.h diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mac80211/sta_info.h diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/sched/sch_tbf.c diff1 | diff2 | blob | history
net/tipc/bearer.c diff1 | diff2 | blob | history
net/tipc/core.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
net/xfrm/xfrm_user.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.