Jakub Kicinski 35b1b1fd96 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

net/dsa/port.c
  9945c1fb03 ("net: dsa: fix older DSA drivers using phylink")
  a88dd75384 ("net: dsa: remove legacy_pre_march2020 detection")
https://lore.kernel.org/all/20230731102254.2c9868ca@canb.auug.org.au/

net/xdp/xsk.c
  3c5b4d69c3 ("net: annotate data-races around sk->sk_mark")
  b7f72a30e9 ("xsk: introduce wrappers and helpers for supporting multi-buffer in Tx path")
https://lore.kernel.org/all/20230731102631.39988412@canb.auug.org.au/

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  37b61cda9c ("bnxt: don't handle XDP in netpoll")
  2b56b3d992 ("eth: bnxt: handle invalid Tx completions more gracefully")
https://lore.kernel.org/all/20230801101708.1dc7faac@canb.auug.org.au/

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
  62da08331f ("net/mlx5e: Set proper IPsec source port in L4 selector")
  fbd517549c ("net/mlx5e: Add function to get IPsec offload namespace")

drivers/net/ethernet/sfc/selftest.c
  55c1528f9b ("sfc: fix field-spanning memcpy in selftest")
  ae9d445cd4 ("sfc: Miscellaneous comment removals")

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

2023-08-03 14:34:37 -07:00

..

asp2

net: bcmasp: Clean up redundant dev_err_probe()

2023-07-28 18:47:23 -07:00

bnx2x

bnx2x: Remove unnecessary ternary operators

2023-08-02 12:09:13 -07:00

bnxt

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

2023-08-03 14:34:37 -07:00

genet

net: bcmgenet: Remove TX ring full logging

2023-07-31 14:42:08 -07:00

b44.c

net: b44: Remove the unused function __b44_cam_read()

2023-01-30 21:03:51 -08:00

b44.h

…

bcm63xx_enet.c

net: ethernet: broadcom: bcm63xx_enet: Drop empty platform remove function

2022-12-30 07:28:49 +00:00

bcm63xx_enet.h

…

bcm4908_enet.c

net: broadcom: bcm4908_enet: report queued and transmitted bytes

2022-11-02 20:38:04 -07:00

bcm4908_enet.h

…

bcmsysport.c

net: systemport: Replace platform_get_irq with platform_get_irq_optional

2023-06-02 09:56:23 +01:00

bcmsysport.h

net: systemport: Add support for RDMA overflow statistic counter

2022-10-31 20:05:03 -07:00

bgmac-bcma-mdio.c

net: ethernet: bgmac: Fix refcount leak in bcma_mdio_mii_register

2022-06-06 14:38:15 -07:00

bgmac-bcma.c

net: bgmac: fix BCM5358 support by setting correct flags

2023-02-09 22:25:31 -08:00

bgmac-platform.c

Revert "net: ethernet: bgmac: Use devm_platform_ioremap_resource_byname"

2022-02-17 08:45:34 -08:00

bgmac.c

net: bgmac: postpone turning IRQs off to avoid SoC hangs

2023-07-08 10:02:15 +01:00

bgmac.h

bgmac: fix *initial* chip reset to support BCM5358

2023-02-28 11:10:05 +01:00

bnx2_fw.h

…

bnx2.c

net: remove __skb_frag_set_page()

2023-05-13 19:47:56 +01:00

bnx2.h

bnx2: Drop redundant pci_enable_pcie_error_reporting()

2023-03-08 23:34:38 -08:00

cnic_defs.h

…

cnic_if.h

…

cnic.c

Merge tag 'dma-mapping-6.2-2022-12-13' of git://git.infradead.org/users/hch/dma-mapping

2022-12-13 09:05:19 -08:00

cnic.h

…

Kconfig

bcmasp: BCMASP should depend on ARCH_BRCMSTB

2023-07-26 21:46:41 -07:00

Makefile

net: bcmasp: Add support for ASP2.0 Ethernet controller

2023-07-17 07:39:04 +01:00

sb1250-mac.c

ethernet: broadcom/sb1250-mac: clean up after SIBYTE_BCM1x55 removal

2023-03-24 09:04:01 +00:00

tg3.c

Add MODULE_FIRMWARE() for FIRMWARE_TG357766.

2023-06-29 09:47:12 -07:00

tg3.h

tg3: Read VPD with pci_vpd_alloc()

2021-08-20 15:49:00 -05:00

unimac.h

…