Merge wireless into wireless-next

Browse source

Given how late we are in the cycle, merge the two fixes from
wireless into wireless-next as they don't see that urgent.
This way, the wireless tree won't need rebasing later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

...

This commit is contained in:

Johannes Berg 2024-05-06 11:44:58 +02:00

parent 2d6c717760 838c7b8f1f

commit 2f324144e0

2 changed files with 8 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

View file

14

net/wireless/nl80211.c

View file