linux-kernel - linux-next: manual merge of the usb tree with Linus' 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: <20110207150802.4869bd47.sfr@canb.auug.org.au>
Date:	Mon, 7 Feb 2011 15:08:02 +1100
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,
	Andiry Xu <andiry.xu@....com>, Alex He <alex.he@....com>
Subject: linux-next: manual merge of the usb tree with Linus' tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-pci.c between commit
baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of ISOC
on AMD Hudson") from Linus' tree and commit
b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL quirk
to pci-quirks.c") from the usb tree.

I just use the version from the usb tree, but this may need fixing up in
pci-quirks.c.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped