usb.patch, with conflicts and some warnings fixed