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

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]

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")

from the phy-next tree.

I fixed it up (see below) 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.

(deleted the file)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]