Re: [GIT PATCH] USB patches for 2.6.15-rc3

[Greg KH <gregkh@suse.de>]

On Wed, Nov 30, 2005 at 10:23:34AM -0800, Linus Torvalds wrote:
> 
> 
> On Tue, 29 Nov 2005, Greg KH wrote:
> >
> >  include/linux/pci_ids.h           |    3 --
> > 
> > Grant Coady:
> >       pci_ids.h: remove duplicate entries
> 
> Why is this in the USB tree, and WHY THE HELL DOES IT EXIST IN THE FIRST 
> PLACE?

Sorry, in the body of the message I stated that I had a pci and a hwmon
driver patch too.  I should have corrected the Subject: too.

> Not only does it have absolutely nothing to do with USB, it's totally 
> bogus and incorrect. The commit log is also non-sensical, since it points 
> to a commit that doesn't even exist in that tree.
> 
> It causes
> 
> 	drivers/ide/pci/amd74xx.c:77: error: PCI_DEVICE_ID_AMD_CS5536_IDE undeclared here (not in a function)
> 
> Grr.

Ugh, I thought Grant wanted this in for the main kernel tree, sorry.

Grant, what git tree were you referring to?

I think I'll go back to sending individual patches late in the -rc
series from now on :)

Sorry for the trouble, and thanks for reverting the pci id patch in your
tree.

greg k-h