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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 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 40057C433E6 for ; Wed, 27 Jan 2021 17:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03D6364DB3 for ; Wed, 27 Jan 2021 17:46:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344148AbhA0Rq0 (ORCPT ); Wed, 27 Jan 2021 12:46:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:45744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236250AbhA0RmX (ORCPT ); Wed, 27 Jan 2021 12:42:23 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0DE9F64DA3; Wed, 27 Jan 2021 17:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611769302; bh=ccTYH2EDWJwjCqgjMOwT8emAY3jhxENLNE9fZ1tIX50=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=p170fHNm+U8QcFUVjsMI4G/bsDyQmOyvglCZvtsmV0jIqq+lcVjv3T0czV4MXXJoX GyPiN0yLplbsvdHL8kra2a8irz4Y5J99EScXz9t74Kv/E4mCn1tiGCGWXIj7/oBnOF JHtys5oBgR+jnzTSpQUwuJFCKYKEKQlXJA4ja3IjFlIX2zJkveJ2+33OUw1c3F7srL jscXZ9H25mLxPMKhyipQCzL7yIXaX6DLOk7yGj99FH0ZC33/GGGl5IKOET4E5Acong zus0cZWM2QgD9UF0xJARD0JdxxPhGErNuttsQ0jXROgHHRqbikCBGjneUFt6DTQlc5 Zu6f98c92dGEA== Date: Wed, 27 Jan 2021 18:41:35 +0100 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: Lee Jones , devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Rob Herring , Mayulong , linux-arm-msm@vger.kernel.org, YueHaibing , Liam Girdwood , Wei Xu , linux-kernel@vger.kernel.org, Stephen Boyd , Mark Brown , Dan Carpenter , Colin Ian King , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5 00/21] Move Hisilicon 6421v600 SPMI driver set out of staging Message-ID: <20210127184135.73dec9c3@coco.lan> In-Reply-To: References: <20210126175752.GF4839@sirena.org.uk> <20210126181124.GG4839@sirena.org.uk> <20210127100816.GH4903@dell> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, 27 Jan 2021 11:19:36 +0100 Greg Kroah-Hartman escreveu: > > This patch series finish addressing support for Hikey 970 > > SPMI controller, PMIC and regulators. > >=20 > > This version was generated with -M, in order to make easier > > to merge upstream. Also, rebased on the top of v5.10, > > without any dependencies from the other patch series > > I'm submitting for this board. > >=20 > > Yet, patch 18 to 20 modifies drivers/staging/hikey9xx/Kconfig > > and drivers/staging/hikey9xx/Makefile. So, trivial conflicts > > will rise if they're applied via different trees, as they all > > remove some lines from such files. =20 >=20 > I've applied the first 13 patches, except for patch 3, as that did not > apply, to my tree, thanks. Ok. I'll rebase the remaining patches on the top of staging-testing branch. > On Wed, Jan 27, 2021 at 10:08:16AM +0000, Lee Jones wrote: > > On Wed, 27 Jan 2021, Greg Kroah-Hartman wrote: > > =20 > > > On Tue, Jan 26, 2021 at 06:11:24PM +0000, Mark Brown wrote: =20 > > > > On Tue, Jan 26, 2021 at 07:02:39PM +0100, Greg Kroah-Hartman wrote:= =20 > > > > > On Tue, Jan 26, 2021 at 05:57:52PM +0000, Mark Brown wrote: =20 > > > > =20 > > > > > > Is there a branch we can pull from? =20 > > > > =20 > > > > > Once 0-day passes, you can pull from my staging-testing branch fr= om > > > > > staging.git on git.kernel.org if you want. Give it 24 hours to p= ass > > > > > before it hits that location. =20 > > > >=20 > > > > Thanks. =20 > > >=20 > > > Should be out there now if you want to pull. > > > =20 > > > > > Do you need a tag to pull from? =20 > > > >=20 > > > > It'd be nice but not essential. =20 > > >=20 > > > Why do you want/need this? Having these changes in your tree is good, > > > but what about other coding style cleanups that I will end up applying > > > over time before the 5.12-rc1 merge window opens? Are you wanting to > > > take the moved driver in your tree, or something else? > > >=20 > > > Traditionally moving drivers out of staging can be done 2 ways: > > > - all happens in the staging tree, I take an ack from the > > > subsystem maintainer that this is ok to do. > > > - A new driver enters the "real" subsystem tree, and then I > > > delete the driver in the staging tree. This doesn't preserve > > > history as well (not at all), but can be easier for trees that > > > move quickly (like networking.) > > >=20 > > > Which ever works for you is fine with me, but relying on the code to > > > stay "not touched" in my tree after you pull it almost never happens = due > > > to the number of drive-by coding style cleanups that end up in the > > > staging tree every week. =20 > >=20 > > I would have expected the whole set to be merged as a set into a > > single tree, placed on an immutable branch and a pull-request to be > > sent out for the other maintainers to pull from (if they so wished). > >=20 > > This would ensure development could continue on any/all of the > > affected drivers/files. > >=20 > > If it's not too late, I'd be more than happy to facilitate. =20 >=20 > Given these patches are already in my public tree, that might be a bit > harder, why the huge work for this? Worst case, I just keep all of the > patches that do not actually move the code in my tree, and then things > can move after 5.12-rc1. Whatever works best for Lee/Mark. =46rom my side, I can re-submit the move patches and the DTS ones to be applied after 5.12-rc1, if this would be the preferred way. Thanks, Mauro