linux-kernel - linux-next: manual merge of the usb-gadget tree with the usb.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140908170212.133cb6e0@canb.auug.org.au>
Date:	Mon, 8 Sep 2014 17:02:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Chen <peter.chen@...escale.com>,
	Stefan Agner <stefan@...er.ch>
Subject: linux-next: manual merge of the usb-gadget tree with the
 usb.current tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 ("doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy") from the usb.current tree and commit d0ee68b59e6a
("usb: phy: mxs: Add VF610 USB PHY support") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc Documentation/devicetree/bindings/usb/mxs-phy.txt
index 96681c93b86d,fe3eed89e4c3..000000000000
--- a/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@@ -5,7 -5,7 +5,8 @@@ Required properties
  	* "fsl,imx23-usbphy" for imx23 and imx28
  	* "fsl,imx6q-usbphy" for imx6dq and imx6dl
  	* "fsl,imx6sl-usbphy" for imx6sl
 +	* "fsl,imx6sx-usbphy" for imx6sx
+ 	* "fsl,vf610-usbphy" for Vybrid vf610
    "fsl,imx23-usbphy" is still a fallback for other strings
  - reg: Should contain registers location and length
  - interrupts: Should contain phy interrupt

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)