From patchwork Tue Sep 26 01:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1747329vqu; Tue, 26 Sep 2023 01:04:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFL2cXdD4x0IVpJZJPOpaDBG2b7sCEYZO+JCksAcjr/Vw9uaW5m3OltzCMhfX+F5vniFeEu X-Received: by 2002:a05:6870:ec9e:b0:1d5:c919:bf5e with SMTP id eo30-20020a056870ec9e00b001d5c919bf5emr10937591oab.54.1695715484915; Tue, 26 Sep 2023 01:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695715484; cv=none; d=google.com; s=arc-20160816; b=LT0dpBdofuVga+5NXwYASNgEz3VuI9j99QE/al+39TgA/6ytsEUr7fqUev3TYlCDft I8rYo3Fhwdunj8mHjwgpMzsRDgeefo4mtMhDSyseu96nXvdB89aRbqvA0zeRxVbsMPMb 9/nYHqAkVZ0ngHa/xYy/AfgglEgf3rW5eS1jcvGGzY6KBYMVxzbpRRYp5iXD7W/TLred OWMGQ8F6r+U+zemHM8kRmPBcQz6Nj2frv7GPlPSG2kjEfEPvLP/23ZkxDsGrym8Mdsa0 +ICd4p9+Av5k3ImKSnwD2jxkimPztSTV3KTJPRc7031V2hlNsFeuEP4jU/iuGfDDyVVw HGFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=HDZLuCU5ZxOEpFG2Eug34ssRxcz/61/hDfUmS5JlVAE=; fh=aCzD9iXwpbON9NyDsx/YdsJjRNvnc2RNbf/QjgRAgW8=; b=d+M9LxjJQ59vbQgF+Y2ILgV/82ebiYHny+NyAPUNYYYNSLIrmROskB58QbRC2vNW12 BOPEca4J5htFchjEBSzaFHN8deghmVds1Wsi5JboPyX0oPQ16skFdIUDCmoiIfx3BGHn AV0kswBn03Khuvl3Cz2nD9ktRMgQn2/XMFiP6pew/ETV5b53p0B/JkWH49tBgE4YMYB5 UyQ/z6oDpqdMvtJC5MLf46BuBc4Lrd/PxkJG1i3rRuVPuLT8AewMgskl/JQhPkGDVeFP 9n3H1RjIEcK1t4+M6rT3KWpKIl1+hfk+PJPwA4YLMwlUdlURwx/bSeewNS5nYBMZPJOg V4mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=liggGrUh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id t184-20020a6381c1000000b00578af1e2f3esi11532878pgd.687.2023.09.26.01.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 01:04:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=liggGrUh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9D8898330E9B; Mon, 25 Sep 2023 18:55:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231866AbjIZBzH (ORCPT + 27 others); Mon, 25 Sep 2023 21:55:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230054AbjIZBzG (ORCPT ); Mon, 25 Sep 2023 21:55:06 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F4811F; Mon, 25 Sep 2023 18:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695693297; bh=HDZLuCU5ZxOEpFG2Eug34ssRxcz/61/hDfUmS5JlVAE=; h=Date:From:To:Cc:Subject:From; b=liggGrUhFYLwEy1ikysvKkLCjE9d4cFFReTEi+ZMp/6KnM2sOJkE3jqAzPsjp8ZMx CpLJRYwl4t6WhhyaZHKxxfwVr+8r29T00TWJecwuijyY1NIPkIKTlw+JSo2Ip7OKO+ mnhMsEn6RjX6907U+zwbEBzigPkkgUp8j/rCtgaMCnt6DEsOnjnbWrD9kVi0nBc08i Z3BxCoRRxkgzjbbhwVLN/9qcUDSiclqqcAyslmDR4Q0gS+vTQymLDebLM3/fRV8sBv SXA7cSyS11LCWOOLKNNGGHO6JNj43+W+3Mf+8EH4BIdy/lCGIVKdZLVZ7b02wFmD72 +k8wJfM/NcJ4Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RvjVR02R0z4xPN; Tue, 26 Sep 2023 11:54:54 +1000 (AEST) Date: Tue, 26 Sep 2023 11:54:52 +1000 From: Stephen Rothwell To: Kalle Valo , Johannes Berg , Wireless Cc: Aloka Dixit , Franziska Naepelt , Greg Kroah-Hartman , Johannes Berg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the wireless-next tree with Linus' tree Message-ID: <20230926115452.68a71261@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 18:55:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778086560078702273 X-GMAIL-MSGID: 1778086560078702273 Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c between commit: 1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis") from Linus' tree and commit: 66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon") bb55441c57cc ("wifi: cfg80211: split struct cfg80211_ap_settings") from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c index af155fca39b8,1e683212027c..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c