* [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes @ 2014-10-07 20:20 Fabian Frederick 2014-10-09 9:16 ` Johannes Berg 0 siblings, 1 reply; 4+ messages in thread From: Fabian Frederick @ 2014-10-07 20:20 UTC (permalink / raw) To: linux-kernel Cc: Fabian Frederick, John W. Linville, Johannes Berg, David S. Miller, linux-wireless, netdev s/state/blocked Signed-off-by: Fabian Frederick <fabf@skynet.be> --- net/rfkill/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rfkill/core.c b/net/rfkill/core.c index b3b16c0..fa7cd79 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -329,7 +329,7 @@ static atomic_t rfkill_input_disabled = ATOMIC_INIT(0); /** * __rfkill_switch_all - Toggle state of all switches of given type * @type: type of interfaces to be affected - * @state: the new state + * @blocked: the new state * * This function sets the state of all switches of given type, * unless a specific switch is claimed by userspace (in which case, @@ -353,7 +353,7 @@ static void __rfkill_switch_all(const enum rfkill_type type, bool blocked) /** * rfkill_switch_all - Toggle state of all switches of given type * @type: type of interfaces to be affected - * @state: the new state + * @blocked: the new state * * Acquires rfkill_global_mutex and calls __rfkill_switch_all(@type, @state). * Please refer to __rfkill_switch_all() for details. -- 1.9.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes 2014-10-07 20:20 [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes Fabian Frederick @ 2014-10-09 9:16 ` Johannes Berg [not found] ` <1412846213.1828.28.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Johannes Berg @ 2014-10-09 9:16 UTC (permalink / raw) To: Fabian Frederick Cc: linux-kernel, John W. Linville, David S. Miller, linux-wireless, netdev Applied, with a somewhat better changelog. johannes ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <1412846213.1828.28.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org>]
* Re: [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes [not found] ` <1412846213.1828.28.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org> @ 2014-10-09 15:33 ` John W. Linville 2014-10-09 18:34 ` Johannes Berg 0 siblings, 1 reply; 4+ messages in thread From: John W. Linville @ 2014-10-09 15:33 UTC (permalink / raw) To: Johannes Berg Cc: Fabian Frederick, linux-kernel-u79uwXL29TY76Z2rM5mHXA, David S. Miller, linux-wireless-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA On Thu, Oct 09, 2014 at 11:16:53AM +0200, Johannes Berg wrote: > Applied, with a somewhat better changelog. FWIW, I had already merged that one as-is -- sorry! -- John W. Linville Someday the world will need a hero, and you linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes 2014-10-09 15:33 ` John W. Linville @ 2014-10-09 18:34 ` Johannes Berg 0 siblings, 0 replies; 4+ messages in thread From: Johannes Berg @ 2014-10-09 18:34 UTC (permalink / raw) To: John W. Linville Cc: Fabian Frederick, linux-kernel, David S. Miller, linux-wireless, netdev On Thu, 2014-10-09 at 11:33 -0400, John W. Linville wrote: > On Thu, Oct 09, 2014 at 11:16:53AM +0200, Johannes Berg wrote: > > Applied, with a somewhat better changelog. > > FWIW, I had already merged that one as-is -- sorry! Hmm? That can't be right - then I shouldn't have been able to apply it? I think you're thinking of another rfkill patch: "net: rfkill: gpio: Fix clock status"? johannes ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-09 18:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-07 20:20 [PATCH 1/1 net-next] net: rfkill: kernel-doc warning fixes Fabian Frederick
2014-10-09 9:16 ` Johannes Berg
[not found] ` <1412846213.1828.28.camel-8Nb76shvtaUJvtFkdXX2HixXY32XiHfO@public.gmane.org>
2014-10-09 15:33 ` John W. Linville
2014-10-09 18:34 ` Johannes Berg
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).