Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2682810pxb; Tue, 13 Apr 2021 07:47:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMUcv/j7CqUcOGVgUXW4QHoMfQ/vifwVjOWTTgdX0wDYfPLbsbdIXuBc9BoXD61keA09Q9 X-Received: by 2002:a50:f181:: with SMTP id x1mr21731327edl.250.1618325226199; Tue, 13 Apr 2021 07:47:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618325226; cv=none; d=google.com; s=arc-20160816; b=SQEcAEK67ipxO2kHEBp5K6JEkx5R0U/xZG9jlRRf5Cjd5fCmqBnbFfPvVUdGjJIDtE kUdiwlr+UfwkHBtn1FU3eqXMA6IcbaetDIaCjMBz+hY9pldQ4KuVldvBCbtBeB6cjFnj It/w9BCT9Jj9eI12sMCy2gaI9vEopcmA9+PdKadjinahzevJbslranDQlbeWYM+okixk azp0KBd3bfpzVHrXT2bsprl7NW7kj9gzV9kEL4KZpOurJw7zQICy5mwOgr/4YFhsR0QV s3lqYvbwrfxGS/T3fv79EZ+g7f2WZ6C1bEVxWpkkgN5+0icA/aYLWd1ZovCkQbmxPlaJ f8qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id; bh=0XjyDflAe4Ipkxm/tanSjcphMr72VcUT/mEbiR3HVD4=; b=SGx9Wzr+VXQqIpb6an5x3HW8bPeOYvPjJVvvIBPVg+wsYYkPcGicOzoQwptgHo7i9f ZrFZ1E2iL5TJ9K14V6zgyk0kxVfWbu4PY9j/2QYSLJYfwNgwSJxBJlbuxeqkRZmfXh8C yburFj3IRt4HcDIcg79gk9VOPrp1WwESdMj4XN9ltKXUTR7NUB3r8Iwf/XpyLIc3lyFm S3UDeCiJh1/VlE9Krryxj4FVnirGH0RN3veIUr5k3qj24smmcqRBSixdnxz2iClL7VzW ysL0TN0FUYa8dCfTP0wxpvLyDWP4iOpxNyTdeQFe7hYVsKAzmTA+g8Si7keRh+7AbaDX 5Vhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h16si4872989eje.397.2021.04.13.07.46.39; Tue, 13 Apr 2021 07:47:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238332AbhDMLcw (ORCPT + 99 others); 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