Re: [PATCH] PCI: EHCI: fix crash during suspend on ASUS computers

[Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>]

On Tue, 10 Jul 2012, Greg KH wrote:

> > I'm fine with this patch.  I was going to add these:
> > 
> >     Based-on-patch-by: AceLan Kao <acelan.kao@xxxxxxxxxxxxx>
> >     Reference: https://bugzilla.kernel.org/show_bug.cgi?id=37632
> >     Reference: https://bugzilla.kernel.org/show_bug.cgi?id=42728
> > 
> > I don't have the previous iteration (c2fb8a3fa25513d) in my "next"

The commit is already in 3.5-rc6.  And I intended this fix to get into 
3.5-final, not into Linux-next (I should have said so explicitly in the 
patch).

> > branch.  I think it went through you, Greg.  Do you want to handle
> > this one as well?
> 
> I can easily take it if you don't want to.
> 
> > I *could* do it, but it looks like a messy merge -- I think I'd have
> > to rebase almost everything in my "next" branch -- so I'd rather not.
> > Of course, I do have some D3-related updates in pci_prepare_to_sleep()
> > which will conflict with this, too, so I guess it will be a bit of
> > work for somebody either way.
> 
> Ick, no, don't rebase anything.
> 
> If I take this then we will have merge issues in linux-next, which we
> can work out, and then we will have the same issues for 3.6-rc1 as well.
> 
> Or, Alan can redo the patch based on your next branch, which might make
> it easier for everyone involved?

If Bjorn's "next" branch diverged from Linus's tree before c2fb8a3 was 
added, that would make things more difficult.

Alan Stern

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html