diff options
| author | Jakub Kicinski <[email protected]> | 2023-10-19 20:13:03 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-10-19 20:29:01 +0000 |
| commit | 041c3466f39d7073bbc7fb91c4e5d14170d5eb08 (patch) | |
| tree | c74b553ca90bf3487afc3b04e874fda81f309a08 /net/unix/unix_bpf.c | |
| parent | i40e: Align devlink info versions with ice driver and add docs (diff) | |
| parent | Merge tag 'net-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-041c3466f39d7073bbc7fb91c4e5d14170d5eb08.tar.gz kernel-041c3466f39d7073bbc7fb91c4e5d14170d5eb08.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
net/mac80211/key.c
02e0e426a2fb ("wifi: mac80211: fix error path key leak")
2a8b665e6bcc ("wifi: mac80211: remove key_mtx")
7d6904bf26b9 ("Merge wireless into wireless-next")
https://lore.kernel.org/all/[email protected]/
Adjacent changes:
drivers/net/ethernet/ti/Kconfig
a602ee3176a8 ("net: ethernet: ti: Fix mixed module-builtin object")
98bdeae9502b ("net: cpmac: remove driver to prepare for platform removal")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/unix/unix_bpf.c')
0 files changed, 0 insertions, 0 deletions