Hello, Stephen. On Thu, Dec 31, 2015 at 12:29:15PM +1100, Stephen Rothwell wrote: > 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 :-(. That's me messing up the branch. Will rebase the tree. Sorry about the mess. Thanks. -- tejun -- 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