git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 30 Oct 2016 16:42:58 +0000 (12:42 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 30 Oct 2016 16:42:58 +0000 (12:42 -0400)
commit	6ae95a80628aed8e7f8089259e9bda0d5f87415c
tree	819f32113d3b8374b9fbf72e2202d4c4d4511a60	tree \| snapshot
parent	25127ba9df4669520abd475e18584bcba171a273	commit \| diff
parent	9f67af0ed88ecb01c240b1d3bfabbf32c430e5e1	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

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

67 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/aurora/nb8800.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/switchx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_roce.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_sp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qualcomm/emac/emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/synopsys/dwc_eth_qos.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/at803x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_user.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/u_ether.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/udp.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/log.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/originator.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/ethernet/eth.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/wpa.c	diff1 \|	diff2 \|	blob \| history
net/rds/rds.h	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history
net/switchdev/switchdev.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/aurora/nb8800.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns/hns_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/switchx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_roce.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_sp.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qualcomm/emac/emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/synopsys/dwc_eth_qos.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/at803x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_user.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/u_ether.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/udp.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/log.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/originator.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/ethernet/eth.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/wpa.c	diff1 \|	diff2 \|	blob \| history
net/rds/rds.h	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history
net/switchdev/switchdev.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history