diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-08-23 02:05:09 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-23 02:06:18 +0200 |
| commit | 761d527d5d0036b98a2cecf4de1293d84d452aa1 (patch) | |
| tree | 077007afc1704c75f7e733c69bfd1603b8c8e0df /drivers/net/bonding/bond_debugfs.c | |
| parent | Merge branch 'unmask-upper-dscp-bits-part-1' (diff) | |
| parent | Merge tag 'net-6.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-761d527d5d0036b98a2cecf4de1293d84d452aa1.tar.xz linux-761d527d5d0036b98a2cecf4de1293d84d452aa1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/broadcom/bnxt/bnxt.h
c948c0973df5 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
f2878cdeb754 ("bnxt_en: Add support to call FW to update a VNIC")
Link: https://patch.msgid.link/20240822210125.1542769-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/bonding/bond_debugfs.c')
0 files changed, 0 insertions, 0 deletions