]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0215492 da499f8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 Sep 2016 22:52:44 +0000 (15:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Sep 2016 22:52:44 +0000 (15:52 -0700)
commitb20b378d49926b82c0a131492fa8842156e0e8a9
tree7196847eea049a46442b05f99aee1dc571019381tree | snapshot
parent02154927c115c7599677df57203988e05b576346commit | diff
parentda499f8f5385c181e29978fdaab15a58de185302commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
40 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/cq.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/mlx5_ib.h diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/qp.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nic.h diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nicvf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nicvf_queues.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dcbx.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qede/qede_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/smsc/smsc911x.c diff1 | diff2 | blob | history
drivers/net/ethernet/synopsys/dwc_eth_qos.c diff1 | diff2 | blob | history
drivers/net/phy/Kconfig diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/bridge/br_input.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/flow_dissector.c diff1 | diff2 | blob | history
net/ipv4/fib_frontend.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/xfrm4_policy.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/ipv6/xfrm6_policy.c diff1 | diff2 | blob | history
net/kcm/kcmsock.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
Beck SC1x5 Kernel