diff options
author | 2023-10-05 13:16:31 -0700 | |
---|---|---|
committer | 2023-10-05 13:16:47 -0700 | |
commit | 2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a (patch) | |
tree | 6bd918ad4fc55e677cc6ccb3212eab873c467c7f /drivers/net/macsec.c | |
parent | net_sched: sch_fq: add TCA_FQ_WEIGHTS attribute (diff) | |
parent | Merge tag 'net-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a.tar.xz wireguard-linux-2606cf059c56bfb86d5d6bd0f41bd7eedefc8b0a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts (or adjacent changes of note).
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/macsec.c')
0 files changed, 0 insertions, 0 deletions