* linux-next: manual merge of the trivial tree with the regulator tree
@ 2012-12-10 4:29 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-12-10 4:29 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Masanari Iida, Axel Lin, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/regulator/palmas-regulator.c between commit bdc4baacebda
("regulator: palmas: Convert palmas_ops_smps to regulator_[get|
set]_voltage_sel_regmap") from the regulator tree and commit 02582e9bcc36
("treewide: fix typo of "suport" in various comments and Kconfig") from
the trivial tree.
I fixed it up (I used the former as it also fixed the typo) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the trivial tree with the regulator tree
@ 2015-08-10 2:37 Stephen Rothwell
2015-08-10 4:07 ` Krzysztof Kozłowski
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-08-10 2:37 UTC (permalink / raw)
To: Jiri Kosina, Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Krzysztof Kozlowski
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@canb•auug.org.au
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the regulator tree
2015-08-10 2:37 linux-next: manual merge of the trivial tree with the regulator tree Stephen Rothwell
@ 2015-08-10 4:07 ` Krzysztof Kozłowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozłowski @ 2015-08-10 4:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jiri Kosina, Mark Brown, Liam Girdwood, linux-next, linux-kernel
2015-08-10 11:37 GMT+09:00 Stephen Rothwell <sfr@canb•auug.org.au>:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-10 4:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-10 2:37 linux-next: manual merge of the trivial tree with the regulator tree Stephen Rothwell
2015-08-10 4:07 ` Krzysztof Kozłowski
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 4:29 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox