Jakub Kicinski 1a2352ad82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

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

No conflicts, adjacent changes:

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  ded9813d17 ("net: stmmac: Consider Tx VLAN offload tag length for maxSDU")
  26ab9830be ("net: stmmac: replace has_xxxx with core_type")

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

2025-10-31 06:46:03 -07:00

..

bat_algo.c

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

bat_algo.h

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

bat_iv_ogm.c

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

bat_iv_ogm.h

…

bat_v_elp.c

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

bat_v_elp.h

batman-adv: Drop unmanaged ELP metric worker

2025-01-22 21:46:42 +01:00

bat_v_ogm.c

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

bat_v_ogm.h

…

bat_v.c

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

bat_v.h

…

bitarray.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

bitarray.h

…

bridge_loop_avoidance.c

batman-adv: use skb_crc32c() instead of skb_seq_read()

2025-10-17 16:30:43 +02:00

bridge_loop_avoidance.h

…

distributed-arp-table.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

distributed-arp-table.h

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

fragmentation.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

fragmentation.h

…

gateway_client.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

gateway_client.h

…

gateway_common.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

gateway_common.h

…

hard-interface.c

batman-adv: remove includes for extern declarations

2025-09-05 15:11:02 +02:00

hard-interface.h

batman-adv: remove includes for extern declarations

2025-09-05 15:11:02 +02:00

hash.c

…

hash.h

…

Kconfig

batman-adv: use skb_crc32c() instead of skb_seq_read()

2025-10-17 16:30:43 +02:00

log.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

log.h

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

main.c

batman-adv: keep skb crc32 helper local in BLA

2025-09-05 15:11:02 +02:00

main.h

batman-adv: Start new development cycle

2025-10-17 16:30:43 +02:00

Makefile

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

mesh-interface.c

batman-adv: remove includes for extern declarations

2025-09-05 15:11:02 +02:00

mesh-interface.h

batman-adv: remove includes for extern declarations

2025-09-05 15:11:02 +02:00

multicast_forw.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

multicast.c

batman-adv: store hard_iface as iflink private data

2025-05-31 10:41:11 +02:00

multicast.h

…

netlink.c

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

netlink.h

batman-adv: remove includes for extern declarations

2025-09-05 15:11:02 +02:00

originator.c

Merge tag 'batadv-net-pullrequest-20251024' of https://git.open-mesh.org/linux-merge

2025-10-27 18:00:54 -07:00

originator.h

…

routing.c

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

routing.h

…

send.c

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

send.h

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

tp_meter.c

treewide, timers: Rename from_timer() to timer_container_of()

2025-06-08 09:07:37 +02:00

tp_meter.h

…

trace.c

…

trace.h

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

translation-table.c

batman-adv: remove network coding support

2025-09-05 15:11:00 +02:00

translation-table.h

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

tvlv.c

batman-adv: Use consistent name for mesh interface

2025-02-22 11:36:22 +01:00

tvlv.h

…

types.h

batman-adv: use skb_crc32c() instead of skb_seq_read()

2025-10-17 16:30:43 +02:00