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

2015-08-09 Thread Krzysztof Kozłowski
2015-08-10 11:37 GMT+09:00 Stephen Rothwell : > 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

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

2015-08-09 Thread Stephen Rothwell
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

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

2012-12-09 Thread Stephen Rothwell
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