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 15:44:56 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thierry Reding <thierry.reding@gmail.com>,
        Rob Herring <robherring2@gmail.com>
Cc:     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: linux-next: manual merge of the pwm tree with the devicetree tree
Message-ID: <20191115154456.244c27e4@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/RyIrEUa4PrOL3P+S8eK5+Yh";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/RyIrEUa4PrOL3P+S8eK5+Yh
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the pwm tree got a conflict in:

  Documentation/devicetree/bindings/pwm/pwm-stm32.txt

between commit:

  56fb34d86e87 ("dt-bindings: mfd: Convert stm32 timers bindings to json-sc=
hema")

from the devicetree tree and commit:

  4205e356285e ("dt-bindings: pwm-stm32: Document pinctrl sleep state")

from the pwm tree.

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/RyIrEUa4PrOL3P+S8eK5+Yh
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3OLUgACgkQAVBC80lX
0GzU2gf+PT9N1c5iWBlI7Fz+cTmIEOoRDiTnRPH+F6HNsJrHCA397ENwXZldksVq
+ocghgddSJILnIRUBhMygIDEbwAenf3avYHdWuXjhTm/8uJOwWULbZWx/uEQiUkA
gEkgX437WGv7OsmZMuk55S6bCCVW822ZT4EkNGawgwDRhwV5PD8mYkIkX2tk2O/E
a2qY54g0PztvfiFYV1rv1unvAHv44YVW5Pm1I6JCOCBs8+57vHSXEwjPBGIadOLk
TLuR5imLGueOtddv3eM1eldaSqQTF5M37GA1qc6TEjO9MWhrXGeu6nSCmbF/Vcm1
BP7QAQkFcP4iYSSD7+KcayA1oJcBKQ==
=n2vS
-----END PGP SIGNATURE-----

--Sig_/RyIrEUa4PrOL3P+S8eK5+Yh--