Jakub Kicinski 173780ff18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/linux/mlx5/driver.h 617f5db1a6 ("RDMA/mlx5: Fix affinity assignment") dc13180824 ("net/mlx5: Enable devlink port for embedded cpu VF vports") https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/ tools/testing/selftests/net/mptcp/mptcp_join.sh 47867f0a7e ("selftests: mptcp: join: skip check if MIB counter not supported") 425ba80312 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not") 45b1a1227a ("mptcp: introduces more address related mibs") 0639fa230a ("selftests: mptcp: add explicit check for new mibs") https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/ No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-06-15 22:19:41 -07:00
..
am65-cpsw-ethtool.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
am65-cpsw-nuss.c	net: ethernet: ti: am65-cpsw: Call of_node_put() on error path	2023-06-13 20:47:03 -07:00
am65-cpsw-nuss.h	net: ethernet: ti: am65-cpsw: add .ndo to set dma per-queue rate	2023-03-28 15:29:22 +02:00
am65-cpsw-qos.c	net/sched: taprio: replace tc_taprio_qopt_offload :: enable with a "cmd" enum	2023-05-31 10:00:30 +01:00
am65-cpsw-qos.h	net: ethernet: ti: am65-cpsw: add .ndo to set dma per-queue rate	2023-03-28 15:29:22 +02:00
am65-cpsw-switchdev.c	net: ti: am65-cpsw-nuss: remove guards against !BRIDGE_VLAN_INFO_BRENTRY	2022-02-17 14:17:10 +00:00
am65-cpsw-switchdev.h
am65-cpts.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-03-24 10:10:20 -07:00
am65-cpts.h	net: ethernet: ti: am65-cpsw/cpts: Fix CPTS release action	2023-01-24 10:08:50 +01:00
cpmac.c	net: cpmac: Add __init/__exit annotations to module init/exit funcs	2022-09-29 13:39:58 +02:00
cpsw_ale.c	net: ethernet: ti: cpsw_ale: Add cpsw_ale_restore() helper	2022-11-07 12:20:03 +00:00
cpsw_ale.h	net: ethernet: ti: cpsw_ale: Add cpsw_ale_restore() helper	2022-11-07 12:20:03 +00:00
cpsw_ethtool.c	drivers: ethernet: cpsw: fix panic when interrupt coaleceing is set via ethtool	2022-03-23 10:46:42 -07:00
cpsw_new.c	net: ti/cpsw: Add explicit platform_device.h and of_platform.h includes	2023-04-12 10:54:12 +01:00
cpsw_priv.c	net/sched: move struct tc_mqprio_qopt_offload from pkt_cls.h to pkt_sched.h	2023-02-06 10:06:43 +00:00
cpsw_priv.h	eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define	2022-04-29 11:56:41 +01:00
cpsw_sl.c
cpsw_sl.h
cpsw_switchdev.c	net: ti: cpsw: remove guards against !BRIDGE_VLAN_INFO_BRENTRY	2022-02-17 14:17:10 +00:00
cpsw_switchdev.h
cpsw-common.c
cpsw-phy-sel.c	net: Use of_property_read_bool() for boolean properties	2023-03-16 17:41:28 +00:00
cpsw.c	net: ti/cpsw: Add explicit platform_device.h and of_platform.h includes	2023-04-12 10:54:12 +01:00
cpsw.h
cpts.c	ptp: cpts: convert .adjfreq to .adjfine	2022-11-11 10:58:39 +00:00
cpts.h
davinci_cpdma.c
davinci_cpdma.h
davinci_emac.c	net: drop the weight argument from netif_napi_add	2022-09-28 18:57:14 -07:00
davinci_mdio.c	net: mdio: mdio-bitbang: Separate C22 and C45 transactions	2023-01-10 15:53:36 -08:00
k3-cppi-desc-pool.c
k3-cppi-desc-pool.h
Kconfig	net: ethernet: ti: davinci_mdio: fix build for mdio bitbang uses	2022-08-24 18:44:24 -07:00
Makefile
netcp_core.c	Revert "net: netcp: MAX_SKB_FRAGS is now 'int'"	2023-03-31 21:18:02 -07:00
netcp_ethss.c	net: Use of_property_read_bool() for boolean properties	2023-03-16 17:41:28 +00:00
netcp_sgmii.c
netcp_xgbepcsr.c
netcp.h
tlan.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
tlan.h