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

No conflicts and no adjacent changes.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_main.h
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/phy/realtek/realtek_main.c
Simple merge

diff --cc net/ethtool/netlink.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge