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 [email protected]
http://www.canb.auug.org.au/~sfr/
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:[email protected]]
> Sent: Monday, February 07, 2011 12:08 PM
> To: Greg KH
> Cc: [email protected]; [email protected]; 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 [email protected]
> http://www.canb.auug.org.au/~sfr/
Hi,
I just found that the patch is already in linux-next branch.
The patch "USB host: Move AMD PLL quirk to pci-quirks.c" already covers
the patch "USB: EHCI: ASPM quirk of ISOC on AMD Hudson", so with the
quirk moving patch, the EHCI ASPM patch is not needed. When I submit the
quirk moving patchset, the EHCI ASPM patch has not been merged into
linux-next. Sorry for the confliction.
Do I still need to resend the quirk moving patchset?
Thanks & Best regards,
Andiry
> -----Original Message-----
> From: Xu, Andiry
> Sent: Wednesday, February 09, 2011 10:31 AM
> To: 'Stephen Rothwell'; Greg KH
> Cc: [email protected]; [email protected]; He,
Alex;
> 'Alan Stern'
> 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:[email protected]]
> > Sent: Monday, February 07, 2011 12:08 PM
> > To: Greg KH
> > Cc: [email protected]; [email protected]; 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 [email protected]
> > http://www.canb.auug.org.au/~sfr/
On Mon, Feb 07, 2011 at 03:08:02PM +1100, Stephen Rothwell wrote:
> 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.
I have reverted the patch in the usb-next tree, and merged with Linus's
tree, so the usb-next tree should be all good now.
Andriy, can you resend me a new version of this patch that I can apply,
as I couldn't resolve the merge issues, they were just too great.
thanks,
greg k-h