On Wed, Jan 05, 2011 at 09:05:40AM -0800, Greg KH wrote: > On Tue, Jan 04, 2011 at 11:37:40PM -0800, Sarah Sharp wrote: > > Hi Greg, > > > > Here's some xHCI patches for 2.6.38, including the late bug fixes for > > suspend and resume (which are marked for stable). > > > > There's also some patches from Andiry to fix some isochronous transfer > > bugs, ring ownership issues, and some cleanup patches. Matthew Wilcox > > also submitted a patch to shave off another register read on the URB > > submission path, so that should give us an additional performance boost. > > I've stress-tested this batch, and they look stable. ... > > drivers/usb/core/hcd-pci.c | 7 +++- > > drivers/usb/core/hub.c | 19 +++++++++ > > drivers/usb/host/xhci-ring.c | 91 +++++++++++++++++++++++------------------ > > drivers/usb/host/xhci.c | 60 +++++++++++---------------- > > drivers/usb/host/xhci.h | 16 +++----- > > include/linux/usb/hcd.h | 1 + > > 6 files changed, 108 insertions(+), 86 deletions(-) > > Something's really wrong here, I get a much different diffstat here, one > that includes lots of non-usb patches (like the 2.6.37-rc7 release from > Linus). > > Are you sure you generated this correctly? Care to retry it in a format > that doesn't also merge with Linus's tree? I'm not sure what's up with that. I basically pulled down your usb-next branch and then added these patches on top of them. I do see a merge commit by you (2af1084) on usb-next that says you merged in 2.6.37-rc5 to avoid a conflict, but gitk shows you pulled in 2.6.37-rc7. The for-usb-next branch is based on commit 2af1084. > Also, as these are a bit late for the -rc1 merge (i.e. they needed to be > in linux-next a few weeks ago), can they wait for after the -rc1 merge > because they really are just bugfixes? That way we can test them better > and I don't have to worry about dealing with untested code sent to Linus > at the last minute... Yes, most of them are just bug fixes, and I can wait until after -rc1. Do you want the doorbell patch and the cleanup patches as well? They're not exactly bug fixes, but they are fairly small changes. Sarah Sharp -- 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
