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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/admin-guide/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc include/linux/phy.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/ipv4/netfilter/nf_reject_ipv4.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/netfilter/ipset/ip_set_core.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/smc/smc_clc.h
Simple merge