diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-27 21:12:07 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-27 21:14:11 +0200 |
| commit | 193b9b200224dab4eaec407eb2955303a521f5b6 (patch) | |
| tree | 95366182cc2871667a60613a921f7bfae0b9e2c7 /drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | |
| parent | Merge branch 'series-to-deliver-ethernet-for-stm32mp25' (diff) | |
| parent | Merge tag 'wireless-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-193b9b200224dab4eaec407eb2955303a521f5b6.tar.xz linux-193b9b200224dab4eaec407eb2955303a521f5b6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
e3f02f32a050 ("ionic: fix kernel panic due to multi-buffer handling")
d9c04209990b ("ionic: Mark error paths in the data path as unlikely")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h')
0 files changed, 0 insertions, 0 deletions