git.kernel.dk Git - linux-2.6-block.git/commit

author	David S. Miller <davem@davemloft.net>
	Sun, 1 Apr 2018 23:49:34 +0000 (19:49 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 1 Apr 2018 23:49:34 +0000 (19:49 -0400)
commit	c0b458a9463bd6be165374a8e9e3235800ee132e
tree	a96c6393749ab231c6dda8c62683493bd1c66070	tree \| snapshot
parent	859a59352e926315b6384c5fd895b00a30659a12	commit \| diff
parent	b5dbc28762fd3fd40ba76303be0c7f707826f982	commit \| diff

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

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

38 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qedr/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qedr/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_ethtool.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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/bpf/jit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/iscsi_tcp.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/if_vlan.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/gateway_client.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_clc.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qedr/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/qedr/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_ethtool.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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/bpf/jit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/rndis_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/iscsi_tcp.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/if_vlan.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/gateway_client.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_clc.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history