linux-kernel - linux-next: manual merge of the usb 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: <20120419151402.6f958fabc6bd96696b4cde3c@canb.auug.org.au>
Date:	Thu, 19 Apr 2012 15:14:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Anatolij Gustschin <agust@...x.de>,
	Ramneek Mehresh <ramneek.mehresh@...escale.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
Fix kernel crash on mpc5121e") from the usb.current tree and commit
58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
support") from the usb tree.

I fixed it up (using the pdata assignment from the latter commit) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped