Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 15 Nov 2019 10:41:41 +0100
From:   Thierry Reding <thierry.reding@gmail.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Rob Herring <robherring2@gmail.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Benjamin Gaignard <benjamin.gaignard@st.com>,
        Fabrice Gasnier <fabrice.gasnier@st.com>
Subject: Re: linux-next: manual merge of the pwm tree with the devicetree tree
Message-ID: <20191115094141.GA825257@ulmo>
References: <20191115154456.244c27e4@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="17pEHd4RhPHOinZp"
Content-Disposition: inline
In-Reply-To: <20191115154456.244c27e4@canb.auug.org.au>
User-Agent: Mutt/1.12.2 (2019-09-21)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Nov 15, 2019 at 03:44:56PM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the pwm tree got a conflict in:
>=20
>   Documentation/devicetree/bindings/pwm/pwm-stm32.txt
>=20
> between commit:
>=20
>   56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-=
schema")
>=20
> from the devicetree tree and commit:
>=20
>   4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")
>=20
> from the pwm tree.
>=20
> I fixed it up (I just deleted the file - more fixup is probably required)
> 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.

It should be trivial to rewrite the sleep state patch on top of the
json-schema conversion and then take that version into the devicetree
tree.

Fabrice, can you resend that patch based on the devicetree tree?

Thierry

--17pEHd4RhPHOinZp
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl3OctIACgkQ3SOs138+
s6ERjA/+MZo1LpZ+YQB6Ncd81YjhN80RZ1LbNTpoDJYuCNYW7I/66ZiccYv8gQJo
n34kwYW4tVMMP8Apj0hfB+t3P7Z/YEwkNlK9dvVZtt2fYVjBvbldtw6FloVfbKwH
2ygGCJ/kse/Ginus9RjWWnLKpgDEODA34oyL5Ctf6sE2+RKhMUbPmsBCC2YSM1ZI
4Zgu5rFY4BdYRzmjbk3gCNaSCy15lotIy/lO3GGmsQvesIMiFu+r6/7qufNyLrPS
EjpPg1/ijacFClElyd5dtDUO8LplzO5T6VIIYNji/iG5GUVw1lrlRa467zTSa6Q7
70/F9L1YnQMEZZo/NEt+4a2oN30ZTbkX7ARcnO61xqchwXEa+NO9YU6PGGo/7Loa
k9l24F0+FNgQNraVCnPcXCYjC1D53DFfUAjDZIGMmeVDj6eDQztZShDJ9H1ObbMQ
yNJNDn1LgwT+tC4ONL9qcu3Z5Hhd8exk6s1vhtKNT5hYm7FMxTNDpfeqGmTpZuDB
w61zmQ1PIyywqV/G7YH6zgQKSDuxtxqZnntobsIR0KMsm53w8Ps8QvlFGz2Cjgh8
KOqbnFNoEjSvzMYwHsIEuetfZtxj3bv9zJGX3a45GDMSThoAEkBIIv9FRLFllAYU
Atmwfxg+tkaqg6ePpwa9G6ZkWAYXN0sH5noud56Ravh6uhNH9Bk=
=Ancq
-----END PGP SIGNATURE-----

--17pEHd4RhPHOinZp--