On Thu, Jul 01, 2010 at 03:42:19PM +0200, Michal Nazarewicz wrote: > This commit adds iSerialNumber to all gadgets that use the Mass > Storage Function. It appears that Windows has problems when > it is not set. > > Not to copy the same code all over again, a fsg_string_serial_fill() > macro has been added to the storage_common.c file which is now also > used in the File Storage Gadget. This patch conflicts with the patch in my tree: Subject: USB: Add a serial number parameter to g_file_storage module So, could you fix the above patch up to play nice with your change so that I can accept 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