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;
Date:   Tue, 4 Oct 2022 14:29:09 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc:     broonie@kernel.org, Lee Jones <lee@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree
Message-ID: <20221004142909.52b6c288@canb.auug.org.au>
In-Reply-To: <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org>
References: <20220930115816.128513-1-broonie@kernel.org>
        <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Wq5GflbkYZdcDVCo0NkNgr/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Wq5GflbkYZdcDVCo0NkNgr/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 30 Sep 2022 14:06:28 +0200 Krzysztof Kozlowski <krzysztof.kozlowski=
@linaro.org> wrote:
>
> On 30/09/2022 13:58, broonie@kernel.org wrote:
> >=20
> > Today's linux-next merge of the mfd tree got a conflict in:
> >=20
> >   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
>=20
> Thanks Mark.
>=20
> > between commit:
> >=20
> >   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices") =20
>=20
> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
>=20
> > from the qcom tree and commits:
> >=20
> >   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> >   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ=
6018") =20
>=20
> This commit depends on the duplicated one (on "Add several devices"), so
> I think all set can stay in MFD and instead Bjorn could drop his copy of
> the commit.
>=20
> If not, please propagate the merge conflict resolution, but not the one
> from Mark.
>=20
> Instead result should look like a328ae8504dbc (from MFD tree).

OK, in linux-next, the resolution is now to take the mfd tree version.

--=20
Cheers,
Stephen Rothwell

--Sig_/Wq5GflbkYZdcDVCo0NkNgr/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM7qIUACgkQAVBC80lX
0Gza5QgAhv/QIgSs/Zp9nKVsOjcwa4mWdAAEueeJhOUFkEKUupwJyDxkqeH1s28u
x69B9xaO06gcHZnpYRZmrlKqId6fJhtjG2W2Vk7zsjSQn4Hqedl6eXcX4yStv/fY
4AC53he3xPnPPQ3Sw53BWaI958GQOMn8Ey1FiBb8MFS93YbUJLOOWmRE6iZNmXzU
z4GnvI94rgjPn4kTA7F5tzMEjOUFG+/GKh9VcbZwkHu7VN1wSctq7sKl6nkzhFFP
7vuJEaDz4q0z+fPSuSI6eupSpoTlz9Q1FCwp9YNJ31/32MjaGCMjJYVRTIAJP1Ww
MXYP/F19MHfWaIULWADVBUEjlvx9hg==
=4bnP
-----END PGP SIGNATURE-----

--Sig_/Wq5GflbkYZdcDVCo0NkNgr/--