From: Johannes Berg <johannes@sipsolutions.net>
To: "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build warning after merge of the mac80211-next tree
Date: Tue, 13 Apr 2021 13:32:17 +0200 [thread overview]
Message-ID: <a058901aa4baf5fa858a83f35c59a9b874c2d964.camel@sipsolutions.net> (raw)
In-Reply-To: <SA0PR11MB4752827232FAEB27E2EBEEB6F24F9@SA0PR11MB4752.namprd11.prod.outlook.com>
On Tue, 2021-04-13 at 10:39 +0000, Grumbach, Emmanuel wrote:
> Hi,
>
> >
> > Hi all,
> >
> > After merging the mac80211-next tree, today's linux-next build (htmldocs)
> > produced this warning:
> >
> > include/net/cfg80211.h:6643: warning: expecting prototype for
> > wiphy_rfkill_set_hw_state(). Prototype was for
> > wiphy_rfkill_set_hw_state_reason() instead
> > include/net/cfg80211.h:6643: warning: expecting prototype for
>
> Ouch
>
> Johannes, this is the fix:
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index 3b296f2b7a2c..c6134220dd8f 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -6634,7 +6634,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev,
> */
>
>
> /**
> - * wiphy_rfkill_set_hw_state - notify cfg80211 about hw block state
> + * wiphy_rfkill_set_hw_state_reason - notify cfg80211 about hw block state
> * @wiphy: the wiphy
> * @blocked: block status
> * @reason: one of reasons in &enum rfkill_hard_block_reasons
>
> Do you want a patch or you amend the original commit?
> It is not in net-next yet.
Please send a separate fix anyway, I've pushed it out publicly after all
and try not to rebase unless absolutely necessary.
johannes
next prev parent reply other threads:[~2021-04-13 11:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 10:33 linux-next: build warning after merge of the mac80211-next tree Stephen Rothwell
2021-04-13 10:39 ` Grumbach, Emmanuel
2021-04-13 11:32 ` Johannes Berg [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 5:43 Stephen Rothwell
2020-11-10 8:43 ` Johannes Berg
2018-05-09 4:56 Stephen Rothwell
2018-05-09 7:44 ` Johannes Berg
2018-05-11 12:20 ` Kalle Valo
2018-05-12 3:55 ` Stephen Rothwell
2018-05-23 21:55 ` Arnd Bergmann
2018-05-24 4:11 ` Kalle Valo
2018-05-24 8:51 ` Arnd Bergmann
2018-05-24 10:08 ` Kalle Valo
2018-05-12 3:57 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a058901aa4baf5fa858a83f35c59a9b874c2d964.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).