Jakub Kicinski 07e5c4eb94 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR (net-6.13-rc4).

No conflicts.

Adjacent changes:

drivers/net/ethernet/renesas/rswitch.h
  32fd46f5b6 ("net: renesas: rswitch: remove speed from gwca structure")
  922b4b955a ("net: renesas: rswitch: rework ts tags management")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-12-19 11:35:07 -08:00

..

conduit.c

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

conduit.h

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

devlink.c

net: dsa: replace devlink resource registration calls by devl_ variants

2024-10-29 16:52:57 -07:00

devlink.h

net: dsa: move rest of devlink setup/teardown to devlink.c

2022-11-22 20:41:47 -08:00

dsa.c

net: dsa: remove obsolete phylink dsa_switch operations

2024-10-07 16:23:10 -07:00

dsa.h

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

Kconfig

net: dsa: vsc73xx: introduce tag 8021q for vsc73xx

2024-07-15 06:55:15 -07:00

Makefile

net: dsa: vsc73xx: introduce tag 8021q for vsc73xx

2024-07-15 06:55:15 -07:00

netlink.c

net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT

2023-10-24 13:08:14 -07:00

netlink.h

net: dsa: kill off dsa_priv.h

2022-11-22 20:41:54 -08:00

port.c

net: dsa: provide implementation of .support_eee()

2024-12-11 20:29:38 -08:00

port.h

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

stubs.c

net: dsa: replace NETDEV_PRE_CHANGE_HWTSTAMP notifier with a stub

2023-04-09 15:35:49 +01:00

switch.c

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

switch.h

net: dsa: Use conduit and user terms

2023-10-24 13:08:14 -07:00

tag_8021q.c

net: dsa: prepare 'dsa_tag_8021q_bridge_join' for standalone use

2024-07-15 06:55:16 -07:00

tag_8021q.h

net: dsa: tag_sja1105: refactor skb->dev assignment to dsa_tag_8021q_find_user()

2024-07-15 06:55:15 -07:00

tag_ar9331.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_brcm.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_dsa.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_gswip.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_hellcreek.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_ksz.c

net: dsa: microchip: update tag_ksz masks for KSZ9477 family

2024-09-10 17:27:56 -07:00

tag_lan9303.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_mtk.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_none.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_ocelot_8021q.c

net: dsa: tag_ocelot_8021q: fix broken reception

2024-12-12 07:10:27 -08:00

tag_ocelot.c

net: mscc: ocelot: use ocelot_xmit_get_vlan_info() also for FDMA and register injection

2024-08-16 09:59:32 +01:00

tag_qca.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_rtl4_a.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_rtl8_4.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_rzn1_a5psw.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_sja1105.c

net: dsa: tag_sja1105: refactor skb->dev assignment to dsa_tag_8021q_find_user()

2024-07-15 06:55:15 -07:00

tag_trailer.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag_vsc73xx_8021q.c

net: dsa: vsc73xx: introduce tag 8021q for vsc73xx

2024-07-15 06:55:15 -07:00

tag_xrs700x.c

net: fill in MODULE_DESCRIPTION()s for DSA tags

2024-01-05 08:06:19 -08:00

tag.c

net: dsa: provide a software untagging function on RX for VLAN-aware bridges

2024-08-16 09:59:32 +01:00

tag.h

net: dsa: restore dsa_software_vlan_untag() ability to operate on VLAN-untagged traffic

2024-12-18 19:22:36 -08:00

trace.c

net: dsa: add trace points for FDB/MDB operations

2023-04-12 08:36:07 +01:00

trace.h

tracing/treewide: Remove second parameter of __assign_str()

2024-05-22 20:14:47 -04:00

user.c

net: dsa: require .support_eee() method to be implemented

2024-12-11 20:29:39 -08:00

user.h

net: dsa: update the unicast MAC address when changing conduit

2024-06-10 13:48:06 +01:00