Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp54630pxb; Wed, 16 Feb 2022 21:38:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBS/wT50lits/CPzzpE2jMT6VnB9jvd4EEG9imABirNYRI7CSmLv/kpocyjyY9lV81gjrU X-Received: by 2002:a05:6402:2055:b0:40f:6a63:2625 with SMTP id bc21-20020a056402205500b0040f6a632625mr1021952edb.329.1645076308737; Wed, 16 Feb 2022 21:38:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645076308; cv=none; d=google.com; s=arc-20160816; b=UeTw9HdxTepGAjiGNZ9SvJfYsUJ9VeDKDy8m6tmb8yJuG69ZjQIKZ/ccuPVavw+RaS +xoyVWJEmSp0BDt+6YRDifdZmOG70FnZvcROWiijRVAAZzp54QPgS0E3sA9xF6pelR4o xzaPLguYT4NA5NVniL7Qzd9y75yt2M3lMpgbahDFZogbnKM9aC0k9fwmMpp6yV4vcnKs TWjuIWhVime66pLpA+bVEowvVh16wq2fPAg9TQrTna91b1H6zs1kBd9+Hg8DAID7sEJQ qYaK/VzoGM2Y44wHzVRNq0d2NdF0hYtuPbcvmy3zpos75hZjcok8sQ87CBUy4/Pwydis 4iIg== 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=Q4H5ayK/zhcWhlzOz/RZe9o6CtiF6QpdLOqPVjAx62I=; b=Zof5D0EQxR1Nwp3EGeNXkgLW0sPG82pygyZDKN8BHSfHvf0LngFwZg6gLQukCbkbKu bLJ3JaLWh4xME1nQOAhHAR+IIF49tfNa9i24jI6JELxPwwFPHGs8599dG10ulNe4Q7g+ hn6DH3L8vgIU1xVkeSvGtVumcrTnVsrIor09ZD7wKMELG1Y2XMfMw2it/QXEe/MncV5f ETaiOf6AFIG3rQqe6p4k132tfwYnGoRHSfuE73tDtMDsAU0iGssCdYBPJui78W1PXIYY l3wie86r6JS/qGfVkz4M0pQyVgKRIWWbly3oBO0wnyUuR2e5ie1z89sGQJcuT874CQfk T+8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=q2szfDln; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b6si3691808ede.25.2022.02.16.21.37.42; Wed, 16 Feb 2022 21:38:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=q2szfDln; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232674AbiBQDQZ (ORCPT + 99 others); Wed, 16 Feb 2022 22:16:25 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:59074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231901AbiBQDQY (ORCPT ); Wed, 16 Feb 2022 22:16:24 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A16D27828C; Wed, 16 Feb 2022 19:16:09 -0800 (PST) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Jzg2X2PzHz4xdL; Thu, 17 Feb 2022 14:16:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1645067765; bh=Q4H5ayK/zhcWhlzOz/RZe9o6CtiF6QpdLOqPVjAx62I=; h=Date:From:To:Cc:Subject:From; b=q2szfDlnQGxWjelfHefyI0SCPx6I6RuIUlvien6XYp8ERAHdkfopY2qL1wcgm0Ik2 GRibm/XUHnNX9R9AZqoADuA57U1shrMzOiyeOMPBCG16Yit6GqQBOJIiPWaJA6y1qe 4SyBb7MDArDq/ys01wtB7yTVbFhO2ZYA7rN84ASjCEyJhdNWq3IGObwgpevGq74+FX J8IdVQYKSJ+u51HzhjZnx14yITSX345IZOcHNqEw91Y8/+oYLXStszADHetA4I+Zde ZUZogiFm7NlcKkOqsNXoeVihKIHH7RmoJ/JlQyKgHB/Wy5exkE18hUP9cuy0htxniO l09T70WlG9G7A== Date: Thu, 17 Feb 2022 14:16:03 +1100 From: Stephen Rothwell To: Greg KH , "Gustavo A. R. Silva" Cc: Greg Kroah-Hartman , "Gustavo A. R. Silva" , Linux Kernel Mailing List , Linux Next Mailing List , Michael Straube Subject: linux-next: manual merge of the staging tree with the kspp-gustavo tree Message-ID: <20220217141603.7a0ef4ed@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/cOJ5DoEW9RgPsujCwh._Ol6"; protocol="application/pgp-signature"; micalg=pgp-sha256 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,T_SCC_BODY_TEXT_LINE 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 --Sig_/cOJ5DoEW9RgPsujCwh._Ol6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/r8188eu/include/ieee80211.h between commit: fbe9ccfe809d ("treewide: Replace zero-length arrays with flexible-array m= embers") from the kspp-gustavo tree and commit: 6c36bcbfcef7 ("staging: r8188eu: remove unused structs from ieee80211.h") from the staging tree. I fixed it up (the latter removed the structs updated by the former) 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. --=20 Cheers, Stephen Rothwell --Sig_/cOJ5DoEW9RgPsujCwh._Ol6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmINvfMACgkQAVBC80lX 0GxPlwf/YT8wvZ1WHcyVSsSxoLEiYyKUTAOIKy3velPLPanzPw/uQ61VUha+5Xyv EwjTOjhB/s9o5FeRWpza/wU04EiffCU2nFsXM4kdgodfw4tnyXMcHQ+Mf+te26v6 asda4+Kl3OF4egzG2LT2f0rKFHbxEbKhnTL5PObNAHDRBARjYziZQnkdm8ygiZZy fg6e3Q0GF9LjI6AUBeYGDV4XmlkIHkqhJjuhTUaJI3ilFgDkJGD6Wa7Bch8qVWNd aMdUcf37eFzgQYEBommXVZC8MQGPoRZKJhR12bX3WdVOmKWtKeRNlp9QZL6XE0ld N79VNiGXKyRyFcjYsuHoIGkRFBQpbA== =bzpT -----END PGP SIGNATURE----- --Sig_/cOJ5DoEW9RgPsujCwh._Ol6--