mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity
linux-stable/drivers/net/ethernet/marvell
History
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
..
mvpp2 net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
octeon_ep octeon_ep: initialize mbox mutexes 2023-07-31 14:31:26 -07:00
octeontx2 octeontx2: Remove unnecessary ternary operators 2023-08-02 12:08:27 -07:00
prestera Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-03 14:34:37 -07:00
Kconfig net: ethernet: Add missing depends on MDIO_DEVRES 2023-04-12 20:38:48 -07:00
Makefile octeon_ep: Add driver framework and device initialization 2022-04-13 12:56:32 +01:00
mv643xx_eth.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-11-10 17:43:53 -08:00
mvmdio.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
mvneta.c net: mvneta: fix txq_map in case of txq_number==1 2023-07-06 10:29:39 +02:00
mvneta_bm.c
mvneta_bm.h
pxa168_eth.c net: marvell: pxa168_eth: drop of_match_ptr for ID table 2023-03-15 08:02:45 +00:00
skge.c net: drop the weight argument from netif_napi_add 2022-09-28 18:57:14 -07:00
skge.h
sky2.c net: Explicitly include correct DT includes 2023-07-27 20:33:16 -07:00
sky2.h