| Message ID | 20231018071041.8175-2-johannes@sipsolutions.net (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | pull-request: wireless-2023-10-18 | expand |
Hello: This pull request was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 18 Oct 2023 09:10:42 +0200 you wrote: > Hi, > > So we have a couple more fixes, all in the stack this time. > > Unfortunately, one of them is for an issue I noticed during > the merge between wireless and wireless-next last time, and > while it was already resolved in wireless-next, the issue > also existed in wireless; as a result, this causes a merge > conflict again when merging wireless and wireless-next (or > obviously net/net-next after pulling this in, etc.). This is > (pretty easily) resolved by taking the version without the > lock, as the lock doesn't exist any more in -next. > > [...] Here is the summary with links: - pull-request: wireless-2023-10-18 https://git.kernel.org/netdev/net/c/88343fbe5a13 You are awesome, thank you!
Hi, So we have a couple more fixes, all in the stack this time. Unfortunately, one of them is for an issue I noticed during the merge between wireless and wireless-next last time, and while it was already resolved in wireless-next, the issue also existed in wireless; as a result, this causes a merge conflict again when merging wireless and wireless-next (or obviously net/net-next after pulling this in, etc.). This is (pretty easily) resolved by taking the version without the lock, as the lock doesn't exist any more in -next. Please pull and let us know if there's any problem. Thanks, johannes The following changes since commit f291209eca5eba0b4704fa0832af57b12dbc1a02: Merge tag 'net-6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2023-10-05 11:29:21 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git tags/wireless-2023-10-18 for you to fetch changes up to f2ac54ebf85615a6d78f5eb213a8bbeeb17ebe5d: net: rfkill: reduce data->mtx scope in rfkill_fop_open (2023-10-11 16:55:10 +0200) ---------------------------------------------------------------- A few more fixes: * prevent value bounce/glitch in rfkill GPIO probe * fix lockdep report in rfkill * fix error path leak in mac80211 key handling * use system_unbound_wq for wiphy work since it can take longer ---------------------------------------------------------------- Johannes Berg (3): wifi: cfg80211: use system_unbound_wq for wiphy work wifi: mac80211: fix error path key leak net: rfkill: reduce data->mtx scope in rfkill_fop_open Josua Mayer (1): net: rfkill: gpio: prevent value glitch during probe net/mac80211/key.c | 3 +-- net/rfkill/core.c | 5 ++--- net/rfkill/rfkill-gpio.c | 4 ++-- net/wireless/core.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-)