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
..
mvpp2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-03-30 14:43:03 -07:00
octeon_ep	octeon_ep: unlock the correct lock on error path	2023-03-29 21:39:35 -07:00
octeontx2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-05-25 19:57:39 -07:00
prestera	net: devlink: let the core report the driver name instead of the drivers	2022-11-30 21:49:38 -08:00
Kconfig	net: ethernet: Add missing depends on MDIO_DEVRES	2023-04-12 20:38:48 -07:00
Makefile	octeon_ep: Add driver framework and device initialization	2022-04-13 12:56:32 +01:00
mv643xx_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-11-10 17:43:53 -08:00
mvmdio.c	net: Remove C45 check in C22 only MDIO bus drivers	2023-01-20 18:12:45 -08:00
mvneta_bm.c
mvneta_bm.h
mvneta.c	net: introduce and use skb_frag_fill_page_desc()	2023-05-13 19:47:56 +01:00
pxa168_eth.c	net: marvell: pxa168_eth: drop of_match_ptr for ID table	2023-03-15 08:02:45 +00:00
skge.c	net: drop the weight argument from netif_napi_add	2022-09-28 18:57:14 -07:00
skge.h
sky2.c	treewide: Convert del_timer*() to timer_shutdown*()	2022-12-25 13:38:09 -08:00
sky2.h