Jakub Kicinski 76ed626479 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/aquantia/aquantia.h
  219343755e ("net: phy: aquantia: add missing include guards")
  61578f6793 ("net: phy: aquantia: add support for PHY LEDs")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  bd07a98178 ("net: txgbe: remove separate irq request for MSI and INTx")
  b501d261a5 ("net: txgbe: add FDIR ATR support")
https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/

include/linux/mlx5/mlx5_ifc.h
  048a403648 ("net/mlx5: IFC updates for changing max EQs")
  99be56171f ("net/mlx5e: SHAMPO, Re-enable HW-GRO")
https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/

Adjacent changes:

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
  4130c67cd1 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f3126515f ("wifi: iwlwifi: mvm: add mvm-specific guard")

include/net/mac80211.h
  816c6bec09 ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP")
  5a009b42e0 ("wifi: mac80211: track changes in AP's TPE")

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

2024-07-04 14:16:11 -07:00

..

c_can

net: can: Use device_get_match_data()

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

cc770

net: handle HAS_IOPORT dependencies

2024-04-08 11:56:56 +01:00

ctucanfd

can: ctucanfd: Convert to platform remove callback returning void

2023-05-15 22:53:50 +02:00

dev

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

esd

can: esd: add support for esd GmbH PCIe/402 CAN interface family

2024-02-12 16:58:30 +01:00

flexcan

net: can: Use device_get_match_data()

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

ifi_canfd

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

m_can

can: m_can: Constify struct m_can_ops

2024-06-28 09:35:13 +02:00

mscan

can: mscan: remove unused struct 'mscan_state'

2024-06-20 11:57:39 +02:00

peak_canfd

can: dev: fix skb drop check

2022-11-07 14:00:27 +01:00

rcar

can: rcar_canfd: Remove superfluous parentheses in address calculations

2024-06-28 09:34:42 +02:00

sja1000

can: sja1000: plx_pci: Reuse predefined CTI subvendor ID

2024-06-20 11:52:56 +02:00

slcan

tty: use u8 for flags

2023-08-11 21:12:45 +02:00

softing

can: softing: remove redundant NULL check

2024-02-12 17:25:42 +01:00

spi

can: mcp251xfd: tef: update workaround for erratum DS80000789E 6 of mcp2518fd

2024-06-28 23:48:12 +02:00

usb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-07-04 14:16:11 -07:00

at91_can.c

can: at91_can: switch to rx-offload implementation

2023-10-05 21:47:45 +02:00

bxcan.c

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

can327.c

tty: use u8 for flags

2023-08-11 21:12:45 +02:00

grcan.c

can: Explicitly include correct DT includes

2023-07-19 08:55:28 +02:00

janz-ican3.c

can: janz-ican3: Convert to platform remove callback returning void

2023-05-15 22:53:50 +02:00

Kconfig

can: Kconfig: remove obsolete help text for slcan

2024-06-20 11:52:56 +02:00

kvaser_pciefd.c

can: kvaser_pciefd: Add MSI interrupts

2024-06-21 09:46:02 +02:00

Makefile

can: esd: add support for esd GmbH PCIe/402 CAN interface family

2024-02-12 16:58:30 +01:00

sun4i_can.c

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

ti_hecc.c

can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp()

2023-07-28 09:45:24 +02:00

vcan.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

vxcan.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

xilinx_can.c

can: xilinx_can: Document driver description to list all supported IPs

2024-06-20 11:52:57 +02:00