Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in: drivers/regulator/max77843.c between commit: 2a32b401a11f ("regulator: Remove the max77843 driver") from the regulator tree and commit: 971bd8fa369a ("treewide: Fix typo in printk") from the trivial tree. I fixed it up (the former removed the file, so I did that) 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