Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-29 Thread Felipe Balbi
Hi, Rob Herring 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 US

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-29 Thread Rob Herring
On Fri, May 29, 2020 at 2:44 AM Felipe Balbi wrote: > > > Hi, > > Greg KH 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 wrote: > >> > > > >> > > On Thu, May 28,

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-29 Thread Felipe Balbi
Hi, Greg KH 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 wrote: >> > > >> > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote: >> > > > Hi all, >>

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-29 Thread Greg KH
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 wrote: > > > > > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's linux-nex

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-29 Thread Greg KH
On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote: > On Thu, May 28, 2020 at 4:49 AM Greg KH 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/

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-28 Thread Rob Herring
On Thu, May 28, 2020 at 4:49 AM Greg KH 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: > > > > 3828

Re: linux-next: manual merge of the usb tree with the devicetree tree

2020-05-28 Thread Greg KH
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"

linux-next: manual merge of the usb tree with the devicetree tree

2020-05-27 Thread Stephen Rothwell
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,dw

Re: linux-next: manual merge of the usb tree with the devicetree tree

2013-06-25 Thread Greg KH
On Tue, Jun 25, 2013 at 04:53:10PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb: > chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the > devicetree tree an

linux-next: manual merge of the usb tree with the devicetree tree

2013-06-24 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx" infix") from the usb tree.