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:     Greg KH <greg@kroah.com>, Rob Herring <robherring2@gmail.com>
Cc:     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: <20200529082840.GC847132@kroah.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>
Date:   Fri, 29 May 2020 11:44:12 +0300
Message-ID: <87pnan1677.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,

Greg KH <greg@kroah.com> writes:
> On Fri, May 29, 2020 at 10:26:41AM +0200, Greg KH wrote:
>> On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
>> > On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
>> > >
>> > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
>> > > > Hi all,
>> > > >
>> > > > 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 bin=
dings")
>> > > >
>> > > > from the devicetree tree and commits:
>> > > >
>> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bin=
dings")
>> > > >
>> > > > 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-next=
 is
>> > > > concerned, but any non trivial conflicts should be mentioned to yo=
ur
>> > > > 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
>> > Ugg, I fixed up a warning on my side...
>> >=20
>> > >
>> > > Sounds good,t hanks.
>> >=20
>> > 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.

=2D-=20
balbi

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

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

iQIzBAEBCAAdFiEElLzh7wn96CXwjh2IzL64meEamQYFAl7Qy1wACgkQzL64meEa
mQaEAQ//ebGPFJPFZCDBmR/81gfFtkrWLbe5ffGQ5IqZETfC8bUijVp5Ge94fxJv
9m9BcA73PHxiIzTs18CzMiQ0FQ39We5J2VL3jpbgBBbdWJu57v5D1ioAm7HDWCp/
8l+Zoy8FvsxmrwiT6FDXtHrp+DZZdfEmN8owWlmu00MorON0e4X6GVwYiaOqRB/7
6Wozo2LhaqghD67TgT3cTMvxWWSL4ebqU+0EWnmZ3WkkHGE+gVaN8RIG6MFSDvsu
+5IvUmHdi40bqtwsFW111bZvb0shNVl5R62cmK7qGASX1+yDT9rncRxAgrR79d7H
v3av0iT4xpu0zpzW8QnbbehAZYkek1lColNwHuopJSo9HyhzVHIvv7KBRYqI8unX
yXOFMraqhVb8mEvtJ3E1OwO5e0tZOPpASd4flOWo/XQO4cHmabtpaet0YNm0XQWQ
HfsuItku6K0Jw9216YSWeehnZ2RDXA6AN34MrfhQLWGSk/+uQ7LCGC+5LkXUWimY
0/asEj3ZCnrNpB+bkyr+X9npdPRDbJgXjQ9r//0vhSDKOF5tRQdkvTs8pMG3OUaB
ewJ8AnzTpzQVzGzQzmfDanPtiiUBM5558nOWwafMHEqPWBIigMg5Pe9Q1WrtuP9p
vK8dDLgz7bcNN1K/7RagQkElMowE6M9+ZKdE6Wxpu+40HBhTZeI=
=cfKX
-----END PGP SIGNATURE-----
--=-=-=--