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 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-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.
--
Cheers,
Stephen Rothwell
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 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-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.
Sounds good,t hanks.
greg k-h
On Thu, May 28, 2020 at 4:49 AM Greg KH <[email protected]> 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 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-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.
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.
Rob
On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
> On Thu, May 28, 2020 at 4:49 AM Greg KH <[email protected]> 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 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-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.
>
> 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.
I can, if you also add the attached patch to your tree, as it was a
follow-on one from the original one and I had to revert it too.
thanks,
greg k-h
-------------------
From 1805cdde37c8cc90b298c3d9afbc2aa4c9890635 Mon Sep 17 00:00:00 2001
From: Sandeep Maheswaram <[email protected]>
Date: Wed, 1 Apr 2020 10:45:42 +0530
Subject: [PATCH] dt-bindings: usb: qcom,dwc3: Introduce interconnect
properties for Qualcomm DWC3 driver
Add documentation for the interconnects and interconnect-names
properties for USB.
Reviewed-by: Rob Herring <[email protected]>
Reviewed-by: Stephen Boyd <[email protected]>
Signed-off-by: Sandeep Maheswaram <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
index 17e22ff528dd..ec1ec47b51cb 100644
--- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
@@ -70,6 +70,14 @@ properties:
resets:
maxItems: 1
+ interconnects:
+ maxItems: 2
+
+ interconnect-names:
+ items:
+ - const: usb-ddr
+ - const: apps-usb
+
interrupts:
items:
- description: The interrupt that is asserted
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 <[email protected]> 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 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-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.
> >
> > 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.
>
> I can, if you also add the attached patch to your tree, as it was a
> follow-on one from the original one and I had to revert it too.
Also this one as well.
---------------------
From b88035625ec9594d4554a307e820aef4b759e35f Mon Sep 17 00:00:00 2001
From: Sandeep Maheswaram <[email protected]>
Date: Thu, 26 Mar 2020 12:36:08 +0530
Subject: [PATCH] dt-bindings: usb: qcom,dwc3: Add compatible for SC7180
Add compatible for SC7180 in usb dwc3 bindings.
Signed-off-by: Sandeep Maheswaram <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
Acked-by: Rob Herring <[email protected]>
Reviewed-by: Stephen Boyd <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
index 0f69475566c7..17e22ff528dd 100644
--- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
@@ -16,6 +16,7 @@ properties:
- enum:
- qcom,msm8996-dwc3
- qcom,msm8998-dwc3
+ - qcom,sc7180-dwc3
- qcom,sdm845-dwc3
- const: qcom,dwc3
Hi,
Greg KH <[email protected]> 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 <[email protected]> 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 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-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.
>> >
>> > 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.
--
balbi
On Fri, May 29, 2020 at 2:44 AM Felipe Balbi <[email protected]> wrote:
>
>
> Hi,
>
> Greg KH <[email protected]> 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 <[email protected]> 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 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-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.
> >> >
> >> > 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.
Rob
Hi,
Rob Herring <[email protected]> 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-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.
>> >> >
>> >> > 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.
--
balbi