From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0B22C433ED for ; Tue, 13 Apr 2021 11:32:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B8FAE6101B for ; Tue, 13 Apr 2021 11:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238332AbhDMLcw (ORCPT ); Tue, 13 Apr 2021 07:32:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231287AbhDMLcu (ORCPT ); Tue, 13 Apr 2021 07:32:50 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C5EAC061574; Tue, 13 Apr 2021 04:32:26 -0700 (PDT) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1lWHHG-00B7NO-B5; Tue, 13 Apr 2021 13:32:18 +0200 Message-ID: Subject: Re: linux-next: build warning after merge of the mac80211-next tree From: Johannes Berg To: "Grumbach, Emmanuel" , Stephen Rothwell , Wireless Cc: Linux Kernel Mailing List , Linux Next Mailing List Date: Tue, 13 Apr 2021 13:32:17 +0200 In-Reply-To: References: <20210413203349.43d3451e@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-malware-bazaar: not-scanned Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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