Hi Arnd, Today's linux-next merge of the y2038 tree got conflicts in: drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c drivers/staging/ft1000/ft1000-usb/ft1000_debug.c drivers/staging/ft1000/ft1000-usb/ft1000_hw.c drivers/staging/ft1000/ft1000.h between commit: 6512edec48b2 ("staging: ft1000: remove obsolete driver") from the staging tree and commit: 8b37bf430656 ("staging: ft1000: Replace timeval and time_t with time64_t") from the y2038 tree. I fixed it up (the former removed the files) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html