Skip to content
Commit e19de206 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_classifier.c
  abd5576b ("net: ti: icssg-prueth: Add support for ICSSG switch firmware")
  56a5cf53 ("net: ti: icssg-prueth: Fix start counter for ft1 filter")
https://lore.kernel.org/all/20240531123822.3bb7eadf@canb.auug.org.au/



No other adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ccf23c91 d8ec1985
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment