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. Thanks, Anton. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
