Hi Tejun, Today's linux-next merge of the libata tree got conflicts all over teh place due to commit: 53fab927a8fc ("ata: ahci_brcmstb: add support for MIPS-based platforms") from the libata tree which seem to contain most (if not all) of Linus' tree :-(. I have used the version of the libata tree from next-20151223 for today. -- 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