From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564Ab2LKIkS (ORCPT ); Tue, 11 Dec 2012 03:40:18 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:55175 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751660Ab2LKIkR (ORCPT ); Tue, 11 Dec 2012 03:40:17 -0500 Date: Tue, 11 Dec 2012 08:40:11 +0000 From: Lee Jones To: Anton Vorontsov 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 Message-ID: <20121211084011.GH9362@gmail.com> References: <1354276654-590-1-git-send-email-lee.jones@linaro.org> <20121211033457.GA32600@lizard.sbx14280.paloaca.wayport.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20121211033457.GA32600@lizard.sbx14280.paloaca.wayport.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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