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

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

author	David S. Miller <davem@davemloft.net>
	Thu, 30 Jun 2016 09:03:36 +0000 (05:03 -0400)
committer	David S. Miller <davem@davemloft.net>
	Thu, 30 Jun 2016 09:03:36 +0000 (05:03 -0400)
commit	20b1f186f3c80f1728d479c09b70fe730b4d52c2
tree	77b815a31240adc4d6326346908137fc6c2c3a96	tree \| snapshot
parent	bcce120b071c7a7c333d92f837073e6cb28f3e54	commit \| diff
parent	b2d6cdce35ae046db9c7a5f4719d7bc3451e7885	commit \| diff

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

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

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

56 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/net/can/dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bgmac.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/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_l2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/fixed_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/htt_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/mac.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/qed/qed_eth_if.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/routing.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/gre_demux.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_cm.c	diff1 \|	diff2 \|	blob \| history
net/rds/loop.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_connect.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_listen.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_send.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_fifo.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_prio.c	diff1 \|	diff2 \|	blob \| history
net/tipc/bearer.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
tools/virtio/ringtest/Makefile	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/net/can/dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/gs_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bgmac.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/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_l2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_spq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/fixed_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/htt_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/mac.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/qed/qed_eth_if.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/routing.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/gre_demux.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/sit.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/rds/ib_cm.c	diff1 \|	diff2 \|	blob \| history
net/rds/loop.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_connect.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_listen.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_recv.c	diff1 \|	diff2 \|	blob \| history
net/rds/tcp_send.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_fifo.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_prio.c	diff1 \|	diff2 \|	blob \| history
net/tipc/bearer.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
tools/virtio/ringtest/Makefile	diff1 \|	diff2 \|	blob \| history