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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amd/amd8111e.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_sriov.c
Simple merge

diff --cc include/net/tls.h
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge