Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Felipe Balbi <balbi@kernel.org>
To:     Rob Herring <robherring2@gmail.com>
Cc:     Greg KH <greg@kroah.com>, Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sandeep Maheswaram <sanm@codeaurora.org>
Subject: Re: linux-next: manual merge of the usb tree with the devicetree tree
In-Reply-To: <CAL_Jsq+cKXO71U_HVG0nZzbQ_B4GwrmcyzkECSTJUAuBzQgcZw@mail.gmail.com>
References: <20200528162215.3a9aa663@canb.auug.org.au> <20200528104916.GD3115014@kroah.com> <CAL_JsqKYUOPFS=0rWuUL2HLNz1DdKbYULckAWnCq-0v96-1S4g@mail.gmail.com> <20200529082641.GB847132@kroah.com> <20200529082840.GC847132@kroah.com> <87pnan1677.fsf@kernel.org> <CAL_Jsq+cKXO71U_HVG0nZzbQ_B4GwrmcyzkECSTJUAuBzQgcZw@mail.gmail.com>
Date:   Fri, 29 May 2020 17:24:20 +0300
Message-ID: <87mu5q250r.fsf@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
        micalg=pgp-sha256; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


Hi,

Rob Herring <robherring2@gmail.com> writes:

>> >> > > > Today's linux-next merge of the usb tree got a conflict in:
>> >> > > >
>> >> > > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
>> >> > > >
>> >> > > > between commit:
>> >> > > >
>> >> > > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 =
bindings")
>> >> > > >
>> >> > > > from the devicetree tree and commits:
>> >> > > >
>> >> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 =
bindings")
>> >> > > >
>> >> > > > from the usb tree.
>> >> > > >
>> >> > > > I fixed it up (I guessed, taking most changes from the former) =
and can
>> >> > > > carry the fix as necessary. This is now fixed as far as linux-n=
ext is
>> >> > > > concerned, but any non trivial conflicts should be mentioned to=
 your
>> >> > > > upstream maintainer when your tree is submitted for merging.  Y=
ou may
>> >> > > > also want to consider cooperating with the maintainer of the
>> >> > > > conflicting tree to minimise any particularly complex conflicts.
>> >> >
>> >> > Ugg, I fixed up a warning on my side...
>> >> >
>> >> > >
>> >> > > Sounds good,t hanks.
>> >> >
>> >> > Greg, can you revert your copy and we can get rid of the conflict.
>>
>> Did things change recently? I always got the message from DT folks that
>> DT changes should go via the driver tree. Has that changed? I can stop
>> taking DT patches, no problem.
>
> Not really. Mainly, I've been taking some schema conversions as they
> tend to be standalone patches and to make sure they validate (this one
> had a warning which I fixed up and that caused the conflict). Most
> bindings don't see multiple updates in a cycle, but this one has
> obviously become a mess.
>
> If it has my Reviewed/Acked-by, then I'm not taking it. If I applied,
> then I've replied saying I did.

fair enough, I may have missed your reply and ended up taking the patch
together with a bigger series.

=2D-=20
balbi

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

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

iQIzBAEBCAAdFiEElLzh7wn96CXwjh2IzL64meEamQYFAl7RGxQACgkQzL64meEa
mQb5DxAAmFm3e7ynkdXSt/X9FVThbhvh3HcbR1VJ9BymE4Q+1cymsBKTdgG8ZqBe
PMpE35+5pqVO2eBnyD7QdrvgljWMC/DiXWf8a82QlZ1gdRlFQwQvcBUxsrDKPvaR
+MlG/mUfXEMEJuFmmJ4bFsmKoJoO+A5S4WOtZuKDfjnp3U+hb3VhTHjiVIS1irbd
AUlNnfBKOtRr4EqMM6OTQUvCG0aaKoV7lRNM4rQXq9pX3NNiBmHpvSXwMAIvliKQ
4jjf6a9yHdSuwstJ81yiIBqXFXeR3EUBgZ3UDXn+3CIIMzqv7xn8kzZSHDoVVrRb
BAwmfyJwMVSNUWiVkqJUQ26rzAQyt0u0Ax8hCFzYWcCeXeM7Iu42SL4jGK86oPO4
MHqZEpFfmgbO+huLq9FaEzfaGRkS1UUG2u8qiICmkIihnGLlpRAFmeVD4XfQoFow
NP8lzzn+Ej+4nYGAoiLuNpzxsIMlIEpKrCd1phgUxFfhUk5qsaZuttTsds4jczKO
O+6InQX7Oi6XAE8oQoMd1JQ13USJGlSZLdPpjW17ZIrUnzP9CoN6YwaWnEI/T31B
ex1HP4u4qKRH+UW1UHoYAqD7OezcoyO6TFtKSLBl+OiJOY3d/Cvye0ke3WD97O5U
iysbWSq4iUE8qEgNp6wcaqtCjxgikju/ktfxRmZA1NubW3PQ5yg=
=53ps
-----END PGP SIGNATURE-----
--=-=-=--