From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Sebastian Reichel <sre@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Subject: linux-next: manual merge of the akpm tree with the battery tree
Date: Fri, 26 Sep 2014 20:30:12 +1000 [thread overview]
Message-ID: <20140926203012.1d150cd3@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2014-09-26 10:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140926203012.1d150cd3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sre@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox