On Wed, Jun 18, 2003 at 12:58:45PM -0700, Matthew Dharm wrote: > Greg -- > > Just a quick heads-up, but I noticed that some changes to scsiglue.c > migrated to the Linus trees from the linux-scsi trees. So there might be a > merging issue with this patch.
Yeah, I had only one conflict when I merged it. > > @@ -384,7 +321,7 @@ > > > > /* pre- and post- device scan functions */ > > .slave_alloc = NULL, > > - .slave_configure = NULL, > > + .slave_configure = slave_configure, > > .slave_destroy = NULL, This is the part I had to do by hand, make sure slave_configure got set properly. I think that I got it correct :) thanks, greg k-h ------------------------------------------------------- This SF.Net email is sponsored by: INetU Attention Web Developers & Consultants: Become An INetU Hosting Partner. Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission! INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php _______________________________________________ [EMAIL PROTECTED] To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
