linux-kernel - RE: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <2DEEA3AB13739D45A22ADDB5086AEA0BF085DD@sshaexmb1.amd.com>
Date:	Wed, 9 Feb 2011 10:31:02 +0800
From:	"Xu, Andiry" <Andiry.Xu@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"He, Alex" <Alex.He@....com>,
	Alan Stern <stern@...land.harvard.edu>
Subject: RE: linux-next: manual merge of the usb tree with Linus' tree

Hi,

I'll resend the PLL quirk moving patchset based on the latest linux-next
tree. 

Thanks & Best regards,
Andiry
 
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Monday, February 07, 2011 12:08 PM
> To: Greg KH
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Xu,
Andiry;
> He, Alex
> 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/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/