From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 31 May 2024 21:09:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: io_uring-6.11-20240722~71^2~278
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e19de2064fdf6f1f2488e36cf3927c3f1d01803c;p=linux-2.6-block.git

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_classifier.c
  abd5576b9c57 ("net: ti: icssg-prueth: Add support for ICSSG switch firmware")
  56a5cf538c3f ("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: Jakub Kicinski <kuba@kernel.org>
---

e19de2064fdf6f1f2488e36cf3927c3f1d01803c