On Fri, Nov 12, 2010 at 02:34:09PM -0800, Sarah Sharp wrote: > Hi Greg, > > Let's try this git thing out, shall we? Here's three xHCI bug fixes for > 2.6.37. > > The "release spinlock" patch fixes the resume issue with allocating > memory with GFP_KERNEL, and releasing and requesting MSI or IRQ lines > with a spinlock held. That patch replaces David Sterba's patch that I > asked you to revert. > > The other two patches fix an isochronous endpoint setup issue with a > Microsoft webcam and a problem with too many "Spurious interrupt" > messages when the xHCI driver shares an IRQ. > > Sarah Sharp > > --- > The following changes since commit 868719752d60fb04a3714d77fdeb780b4d585faf: > Greg Kroah-Hartman (1): > Revert "USB: xhci: Use GFP_ATOMIC under spin_lock" > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci.git for-usb-linus > > Andiry Xu (2): > xHCI: release spinlock when setup interrupt > xHCI: fix wMaxPacketSize mask > > Sarah Sharp (1): > xhci: Remove excessive printks with shared IRQs. > > drivers/usb/host/xhci-mem.c | 4 ++-- > drivers/usb/host/xhci-ring.c | 1 - > drivers/usb/host/xhci.c | 2 ++ > drivers/usb/host/xhci.h | 5 +++++ > 4 files changed, 9 insertions(+), 3 deletions(-) Odd, I got this as the diffstat of the merge instead: $ git pull git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci.git for-usb-linus remote: Counting objects: 33, done. remote: Compressing objects: 100% (13/13), done. remote: Total 25 (delta 21), reused 12 (delta 12) Unpacking objects: 100% (25/25), done. >From git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci * branch for-usb-linus -> FETCH_HEAD Merge made by recursive. drivers/usb/host/xhci-mem.c | 4 +- drivers/usb/host/xhci-ring.c | 1 - drivers/usb/host/xhci.c | 72 ++++++++++++++++++++++++++++++++++++----- drivers/usb/host/xhci.h | 5 +++ 4 files changed, 70 insertions(+), 12 deletions(-) It looks like you added a patch on the 12th: commit b07b8b62431299eb77260aecc9f9b2ccf72869c6 Refs: v2.6.37-rc1-187-gb07b8b6 Author: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx> AuthorDate: Fri Nov 12 11:59:31 2010 -0800 Commit: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx> CommitDate: Fri Nov 12 13:31:50 2010 -0800 xhci: Fix command ring replay after resume. That you did not list in the above merge request. That patch also has 2 signed-off-by from you, with an extra line in the middle of it. Did you mean to do that? So, should I really take this pull, or do you want to redo it? thanks, greg k-h -- 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
