* pull-request: wireless-2023-10-18
@ 2023-10-18 7:10 Johannes Berg
2023-10-19 1:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2023-10-18 7:10 UTC (permalink / raw)
To: netdev; +Cc: linux-wireless
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(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: pull-request: wireless-2023-10-18
2023-10-18 7:10 pull-request: wireless-2023-10-18 Johannes Berg
@ 2023-10-19 1:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-19 1:20 UTC (permalink / raw)
To: Johannes Berg; +Cc: netdev, linux-wireless
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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-19 1:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-18 7:10 pull-request: wireless-2023-10-18 Johannes Berg
2023-10-19 1:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).