linux/drivers/net/ethernet/freescale
Jakub Kicinski d4031ec844 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/raw.c
  3632679d9e ("ipv{4,6}/raw: fix output xfrm lookup wrt protocol")
  c85be08fc4 ("raw: Stop using RTO_ONLINK.")
https://lore.kernel.org/all/20230525110037.2b532b83@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/freescale/fec_main.c
  9025944fdd ("net: fec: add dma_wmb to ensure correct descriptor values")
  144470c88c ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-05-25 19:57:39 -07:00
..
dpaa Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-04-26 10:17:46 +02:00
dpaa2 net: dpaa2-mac: use Autoneg bit rather than an_enabled 2023-03-22 22:43:05 -07:00
enetc net: introduce and use skb_frag_fill_page_desc() 2023-05-13 19:47:56 +01:00
fman phy-for-6.3 2023-02-24 17:22:11 -08:00
fs_enet net: ethernet: remove fs_mii_disconnect and fs_mii_connect declarations 2022-09-19 14:08:14 -07:00
fec.h net: fec: make use of MDIO C45 quirk 2023-04-05 18:58:30 -07:00
fec_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-05-25 19:57:39 -07:00
fec_mpc52xx.c net: Use of_property_read_bool() for boolean properties 2023-03-16 17:41:28 +00:00
fec_mpc52xx.h
fec_mpc52xx_phy.c powerpc/mpc5xxx: Switch mpc5xxx_get_bus_frequency() to use fwnode 2022-06-22 12:51:49 +10:00
fec_ptp.c ptp: convert remaining drivers to adjfine interface 2022-11-11 10:58:39 +00:00
fsl_pq_mdio.c
gianfar.c net: Use of_property_read_bool() for boolean properties 2023-03-16 17:41:28 +00:00
gianfar.h
gianfar_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
Kconfig net: ethernet: Add missing depends on MDIO_DEVRES 2023-04-12 20:38:48 -07:00
Makefile
ucc_geth.c net: drop the weight argument from netif_napi_add 2022-09-28 18:57:14 -07:00
ucc_geth.h
ucc_geth_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
xgmac_mdio.c net: phy: Remove probe_capabilities 2023-01-19 16:23:19 +01:00