linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20140908132707.GC22409@saruman.home>
Date:	Mon, 8 Sep 2014 08:27:07 -0500
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Peter Chen <peter.chen@...escale.com>,
	Stefan Agner <stefan@...er.ch>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the
 usb.current tree

On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote:
> 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).

Thank you, that's the correct fix.

-- 
balbi

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