Re: linux-next: manual merge of the trivial tree with the regulator tree
From: Krzysztof KozÅowski
Date: Mon Aug 10 2015 - 00:07:18 EST
2015-08-10 11:37 GMT+09:00 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> Hi Jiri,
> Today's linux-next merge of the trivial tree got a conflict in:
> 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).
Thanks, that's the proper resolution.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/