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;
Feedback-ID: i56a14606:Fastmail
User-Agent: Cyrus-JMAP/3.9.0-alpha0-531-gfdfa13a06d-fm-20230703.001-gfdfa13a0
Mime-Version: 1.0
Message-Id: <2ef84fb8-b5eb-4c9a-b8a1-0c5f33e7f572@app.fastmail.com>
In-Reply-To: <CAPDyKFoRtEXTGQkNzGza-sS_j1ajGmjtCTaoPB7PXVDE2bS0tQ@mail.gmail.com>
References: <20230707140434.723349-1-ulf.hansson@linaro.org>
 <20230707140434.723349-4-ulf.hansson@linaro.org>
 <0c8938a9-7a26-bf97-51ee-0c271901ec21@linaro.org>
 <CAPDyKFrOye96GyHS0tiTQ02Ve5S6Crtk8=bMsRS9Ljj=h5-nWQ@mail.gmail.com>
 <1496b9c1-289a-c354-f0ae-e14fd4c9bcfa@linaro.org>
 <CAPDyKFr7Mqy5bisLcxcA_iEGWqL8SFt2mDDng7zYEaTD1vNisA@mail.gmail.com>
 <deyyt5r2wkxo7ily434gl3wudls2sbinkmnehssqshwnbzmlwf@lmqskj6zwfu2>
 <CAPDyKFoRtEXTGQkNzGza-sS_j1ajGmjtCTaoPB7PXVDE2bS0tQ@mail.gmail.com>
Date:   Mon, 10 Jul 2023 14:45:12 +0200
From:   "Arnd Bergmann" <arnd@arndb.de>
To:     "Ulf Hansson" <ulf.hansson@linaro.org>,
        "Bjorn Andersson" <andersson@kernel.org>
Cc:     "Neil Armstrong" <neil.armstrong@linaro.org>,
        "Olof Johansson" <olof@lixom.net>, linux-pm@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        "Kevin Hilman" <khilman@baylibre.com>,
        "Jerome Brunet" <jbrunet@baylibre.com>,
        "Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
        linux-amlogic@lists.infradead.org
Subject: Re: [PATCH 03/18] soc: amlogic: Move power-domain drivers to the genpd dir
Content-Type: text/plain
Precedence: bulk

On Mon, Jul 10, 2023, at 14:37, Ulf Hansson wrote:
> On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote:
>> On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote:
>
> If I understand correctly, you are suggesting that each platform
> maintainer should merge the immutable branch with patch1 - and that I
> should send the patches (based on the immutable branch) to each of the
> platform maintainers to manage. Instead of one pull request with
> everything directly to Arnd, right?
>
> This still means that Arnd will have to resolve the conflicts as the
> pull requests arrive in his inbox.
>
> Although, I guess what you are looking for is less work for the soc/
> maintainers, which seems reasonable. Although, in that case, I might
> as well share an immutable branch with the complete series, rather
> than just patch1. That should help Arnd too, I think.
>
> Again, let's leave the call to Arnd on what to do.

I think it's much easier for me to pick up a single branch with
all of your patches. For platform maintainers, other changes can
go one of two ways:

- send a normal pull requests with changes against the same
  files, and have me take care of any conflicts where they
  arise. Since most of the changes are just simple file moves
  rather than changing file contents, 'git mergetool' handles
  these fine is most cases

- If there is a non-obvious merge, the entire genpd branch
  can be shared as an immutable branch, with patches for
  a particular platform rebased on top of that branch.

     Arnd