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

Cross-merge networking fixes after downstream PR.

No conflicts and no adjacent changes.

Signed-off-by: Paolo Abeni <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.h
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/port.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/mac.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/mac.h
Simple merge

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

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

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

diff --cc net/core/filter.c
Simple merge

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