From: Lee Jones <lee.jones@linaro.org>
To: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: linux-kernel@vger.kernel.org, linus.walleij@stericsson.com,
arnd@arndb.de, dwmw2@infradead.org, rajanikanth.hv@linaro.org
Subject: Re: [PATCH 00/12] Refactoring the ab8500 battery management drivers
Date: Tue, 11 Dec 2012 08:40:11 +0000 [thread overview]
Message-ID: <20121211084011.GH9362@gmail.com> (raw)
In-Reply-To: <20121211033457.GA32600@lizard.sbx14280.paloaca.wayport.net>
On Mon, 10 Dec 2012, Anton Vorontsov wrote:
> On Fri, Nov 30, 2012 at 11:57:22AM +0000, Lee Jones wrote:
> > The aim of this and subsequent patch-sets is to refactor battery
> > management services provided by the ab8500 MFD. This first patch-set
> > brings a few modifications to the collection which happened on the
> > internal kernel, but were never Mainlined. There are lots more of
> > these to come. We also tidy-up some of the Device Tree related patches
> > which are currently pending in -next.
>
> It fails to apply...
>
> Applying: ab8500_charger: Charger current step-up/down
> Applying: ab8500_fg: Don't clear the CCMuxOffset bit
> Applying: ab8500_btemp: Detect battery type in workqueue
> Applying: ab8500_btemp: Fix crazy tabbing implementation
> fatal: sha1 information is lacking or useless (drivers/power/ab8500_bmdata.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ab8500_btemp: Fix crazy tabbing implementation
>
> I have tried battery tree (as of eba3b670a9166a91be5a, Nov 18), I have
> tried pristine Linus' tree, and I have tried linux-next. All failed in
> different places.
>
> I have tried to apply the "ab8500_btemp: Fix crazy tabbing implementation"
> manually (which applied with fuzz), but then the other patches failed. So
> I gave up.
>
> What is the base of the patches?
>
> Looking at the patch...
>
> diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c
> index f16b60c..2623b16 100644
> --- a/drivers/power/ab8500_bmdata.c
> +++ b/drivers/power/ab8500_bmdata.c
>
> There is really no f16b60c object in any tree, which makes me think that
> you use some private tree.
Hmm... sorry about that Anton.
Let me base it something a little more pure and resend.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2012-12-11 8:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-30 11:57 [PATCH 00/12] Refactoring the ab8500 battery management drivers Lee Jones
2012-11-30 11:57 ` [PATCH 01/12] ab8500_charger: Charger current step-up/down Lee Jones
2012-11-30 11:57 ` [PATCH 02/12] ab8500_fg: Don't clear the CCMuxOffset bit Lee Jones
2012-11-30 11:57 ` [PATCH 03/12] ab8500_btemp: Detect battery type in workqueue Lee Jones
2012-11-30 11:57 ` [PATCH 04/12] ab8500_btemp: Fix crazy tabbing implementation Lee Jones
2012-11-30 11:57 ` [PATCH 05/12] ab8500-bmdata: Re-jiggle bmdevs_of_probe to be more succinct Lee Jones
2012-11-30 11:57 ` [PATCH 06/12] ab8500_bm: Rename battery management platform data to something more logical Lee Jones
2012-11-30 11:57 ` [PATCH 07/12] ab8500_bm: Always send platform specific battery information via pdata Lee Jones
2012-11-30 11:57 ` [PATCH 08/12] ab8500_btemp: Reorder obtainment of platform specific battery management data Lee Jones
2012-11-30 11:57 ` [PATCH 09/12] ab8500_charger: " Lee Jones
2012-11-30 11:57 ` [PATCH 10/12] ab8500_fg: " Lee Jones
2012-11-30 11:57 ` [PATCH 11/12] abx500_chargalg: " Lee Jones
2012-11-30 11:57 ` [PATCH 12/12] ab8500_bm: Make the battery Device Tree node reference less cryptic Lee Jones
2012-12-01 18:45 ` [PATCH 00/12] Refactoring the ab8500 battery management drivers Linus Walleij
2012-12-11 3:34 ` Anton Vorontsov
2012-12-11 8:40 ` Lee Jones [this message]
2012-12-11 10:30 ` Lee Jones
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=20121211084011.GH9362@gmail.com \
--to=lee.jones@linaro.org \
--cc=anton.vorontsov@linaro.org \
--cc=arnd@arndb.de \
--cc=dwmw2@infradead.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rajanikanth.hv@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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