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

[Vinod Koul]

Hi Mark, Greg,

On 14-09-26, 14:31, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/usb/am33xx-usb.txt
> 
> between commits:
> 
>   d0e95f1c08264 ("dt-bindings: dma: ti,cppi41: Convert to DT schema")
>   267e31adc4831 ("dt-bindings: phy: ti,am335x-usb-phy: Convert to DT schema")
>   1c09fe2edad27 ("dt-bindings: usb: ti,musb-am33xx: Convert to DT schema")
>   185bb9305937f ("dt-bindings: usb: ti,am335x-usb-ctrl-module: Convert to DT schema")
>   ef7e123401d95 ("dt-bindings: usb: ti,am33xx-usb: Convert to DT schema")
> 
> from the usb tree and commit:
> 
>   ae6ee6844d5aa ("dt-bindings: phy: ti,am335x-usb-phy: Convert to DT schema")

Okay I will drop this, it can go thru usb tree. Thanks

-- 
~Vinod