Re: [stable] [patch 25/28] USB: cdc-acm: fix sysfs attribute registration bug

On Fri, Aug 24, 2007 at 01:59:55PM -0400, Alan Stern wrote:
> On Fri, 24 Aug 2007, Greg KH wrote:
> 
> > > Odd.  This doesn't include the entire patch; the second hunk is
> > > missing.  It should go on to say:
> > > 
> > > @@ -1109,10 +1113,12 @@ static void acm_disconnect(struct usb_interface *intf)
> > >  		return;
> > >  	}
> > >  	if (acm->country_codes){
> > > -		device_remove_file(&intf->dev, &dev_attr_wCountryCodes);
> > > -		device_remove_file(&intf->dev, &dev_attr_iCountryCodeRelDate);
> > > +		device_remove_file(&acm->control->dev,
> > > +				&dev_attr_wCountryCodes);
> > > +		device_remove_file(&acm->control->dev,
> > > +				&dev_attr_iCountryCodeRelDate);
> > >  	}
> > > -	device_remove_file(&intf->dev, &dev_attr_bmCapabilities);
> > > +	device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
> > 
> > 
> > I thought so too, untill you look at the 2.6.22.5 release, which already
> > has that change in it for some reason.
> > 
> > So that part of the patch drops out, it turns out you just reverted
> > things back to the way things used to be here :)
> 
> I don't understand.  The history for stable/linux-2.6.22.y.git at
> http://git.kernel.org shows that the commit for my patch, labelled
> 
> 	6b30a4e1c357410a78d7bcb831743b0e99bab4ad,
> 
> includes both hunks.  And patch-2.6.22.5.bz2 includes both as well.  
> Something's fishy.

Ah crap, I see it now, this was already applied, I tried to apply it
again, it went with some fuzz for one chunk, which I ignored.

I'm starting to really appreciate Linus's hate for patch-fuzz :)

I'll drop this from the queue as it's already in the -stable series.
Thanks for pointing out my mistake, I appreciate it.

greg k-h