git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 28 Jan 2017 15:33:06 +0000 (10:33 -0500)
committer	David S. Miller <davem@davemloft.net>
	Sat, 28 Jan 2017 15:33:06 +0000 (10:33 -0500)
commit	4e8f2fc1a55d543717efb70e170b09e773d0542b
tree	30df1d7fc9dfa24fe2916711a17656682c3f7ec9	tree \| snapshot
parent	158f323b9868b59967ad96957c4ca388161be321	commit \| diff
parent	1b1bc42c1692e9b62756323c675a44cb1a1f9dbd	commit \| diff

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

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

44 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/multi_v7_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/isdn/hardware/eicon/message.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_roce.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/fragmentation.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/lwt_bpf.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel_core.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_fastopen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/inet6_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/mpls/mpls_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/multi_v7_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/isdn/hardware/eicon/message.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/alx/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_roce.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/cdc_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/phy.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/fragmentation.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/lwt_bpf.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel_core.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_fastopen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/inet6_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/mpls/mpls_iptunnel.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history