Merge ecf99864 ("Merge branch 'mx95-netc-support'") into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	MAINTAINERS
	drivers/net/ethernet/freescale/enetc/enetc_pf.c
	drivers/net/phy/phylink.c
	include/linux/netdevice.h
	net/core/fib_rules.c

Change-Id: Ia1d38dadc9097654b0392a0d475f3c985f5c404b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>