Re: [GIT PATCH] USB bugfixes and a PCI one too for 2.6.12-rc6

[Greg KH <gregkh@suse.de>]

On Thu, Jun 09, 2005 at 10:49:09AM -0700, Linus Torvalds wrote:
> 
> 
> On Thu, 9 Jun 2005, Greg KH wrote:
> > 
> > Please pull from:
> > 	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
> > 
> >  drivers/block/ub.c                      |   10 -
> >  drivers/pci/hotplug/cpci_hotplug_core.c |    4 
> >  drivers/pci/hotplug/cpci_hotplug_pci.c  |   10 +
> >  drivers/usb/serial/ftdi_sio.c           |  236 ++++++++++++++++++++++++--------
> >  4 files changed, 198 insertions(+), 62 deletions(-)
> 
> Hmm.. I see the three commits you mention, but this doesn't match what I
> get:
> 
> 	 drivers/block/ub.c                      |    4 +
> 	 drivers/pci/hotplug/cpci_hotplug_core.c |    2 +
> 	 drivers/pci/hotplug/cpci_hotplug_pci.c  |    5 +
> 	 drivers/usb/serial/ftdi_sio.c           |  118 ++++++++++++++++++++++++-------
> 	 4 files changed, 99 insertions(+), 30 deletions(-)
> 
> whazzup?

My scripts generated patches that were duplicates due to either something in my
scripts that messed up, or due to some way that the git commands changed from
the last time I checked.  Odds are it's my fault.  So it counted
everything twice.  Let me go generate the patches again...

Ok, here's what I get:

 drivers/block/ub.c                      |    4 -
 drivers/pci/hotplug/cpci_hotplug_core.c |    2 
 drivers/pci/hotplug/cpci_hotplug_pci.c  |    5 +
 drivers/usb/serial/ftdi_sio.c           |  118 ++++++++++++++++++++++++--------
 4 files changed, 99 insertions(+), 30 deletions(-)

So your merge is correct.  Thanks for verifying.

greg k-h