* linux-next: manual merge of the akpm tree with the battery tree
@ 2014-09-26 10:30 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-26 10:30 UTC (permalink / raw)
To: Andrew Morton, Sebastian Reichel
Cc: linux-next, linux-kernel, Krzysztof Kozlowski
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/power/Kconfig between commit 6a91e854442c ("power: max14577:
Fix circular config SYSFS dependency") from the battery tree and commit
821246576e03 ("drivers/power/Kconfig: revert part of "charger:
max14577: Add support for MAX77836 charger"") from the akpm tree.
I dropped the akpm tree patch as the battery tree patch fixes the same
problem.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-26 10:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-26 10:30 linux-next: manual merge of the akpm tree with the battery tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox