diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-31 23:09:20 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-31 23:10:28 +0200 |
| commit | e19de2064fdf6f1f2488e36cf3927c3f1d01803c (patch) | |
| tree | 3af14944616afdc409c97e012fb3d82cd1fa78ff /include/net/netdev_queues.h | |
| parent | tools: ynl: make the attr and msg helpers more C++ friendly (diff) | |
| parent | Merge tag 'net-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-e19de2064fdf6f1f2488e36cf3927c3f1d01803c.tar.xz linux-e19de2064fdf6f1f2488e36cf3927c3f1d01803c.zip | |
Merge git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'include/net/netdev_queues.h')
0 files changed, 0 insertions, 0 deletions