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

author	David S. Miller <davem@davemloft.net>
	Thu, 20 Dec 2018 18:53:28 +0000 (10:53 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 20 Dec 2018 19:53:36 +0000 (11:53 -0800)
commit	2be09de7d6a06f58e768de1255a687c9aaa66606
tree	298f9e04caf105873d987e807eccba27710a49cc	tree \| snapshot
parent	44a7b3b6e3a458f9549c2cc28e74ecdc470e42f1	commit \| diff
parent	1d51b4b1d3f2db0d6d144175e31a84e472fbd99a	commit \| diff

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

Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

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

68 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/memory.h	diff1 \|	diff2 \|	blob \| history
drivers/crypto/chelsio/chtls/chtls_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/odp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.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_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.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/wmi-tlv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_tunnels.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_udp_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6mr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_output.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/bpf_flow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/memory.h	diff1 \|	diff2 \|	blob \| history
drivers/crypto/chelsio/chtls/chtls_cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/odp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/chip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.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_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.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_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/flower/offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_ll2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.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/wmi-tlv.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_tunnels.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_udp_tunnel.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6mr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history
net/sctp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_input.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_output.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/bpf_flow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history