diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2025-04-24 11:14:16 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-04-24 11:20:52 -0700 |
| commit | 5565acd1e6c4a1994e0ba32281ec10b69c0be14d (patch) | |
| tree | 2856eea8e8fd624c9f8e29068ef24b65c663b074 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | net: phy: marvell-88q2xxx: Enable temperature sensor for mv88q211x (diff) | |
| parent | vxlan: vnifilter: Fix unlocked deletion of default FDB entry (diff) | |
| download | wireguard-linux-5565acd1e6c4a1994e0ba32281ec10b69c0be14d.tar.xz wireguard-linux-5565acd1e6c4a1994e0ba32281ec10b69c0be14d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.15-rc4).
This pull includes wireless and a fix to vxlan which isn't
in Linus's tree just yet. The latter creates with a silent conflict
/ build breakage, so merging it now to avoid causing problems.
drivers/net/vxlan/vxlan_vnifilter.c
094adad91310 ("vxlan: Use a single lock to protect the FDB table")
087a9eb9e597 ("vxlan: vnifilter: Fix unlocked deletion of default FDB entry")
https://lore.kernel.org/20250423145131.513029-1-idosch@nvidia.com
No "normal" conflicts, or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions