2015-08-10 02:37:34

by Stephen Rothwell

Subject: linux-next: manual merge of the trivial tree with the regulator tree

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 [email protected]

2015-08-10 04:07:15

by Krzysztof Kozłowski

Subject: Re: linux-next: manual merge of the trivial tree with the regulator tree

2015-08-10 11:37 GMT+09:00 Stephen Rothwell <[email protected]>:
> 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).

Thanks, that's the proper resolution.

Best regards,
Krzysztof