Re: [PATCH v7 0/5] Add ST-Ericsson AB8500 HWMON driver

From: Anton Vorontsov
Date: Sat Mar 30 2013 - 19:24:30 EST


Hi Hongbo,

On Wed, Mar 27, 2013 at 03:13:27PM +0800, Hongbo Zhang wrote:
[...]
> Hongbo Zhang (5):
> ab8500_btemp: make ab8500_btemp_get* interfaces public
> ab8500: power: eliminate CamelCase warning of some variables
> ab8500: power: add const attributes to some data arrays
> ab8500: power: export abx500_res_to_temp tables for hwmon
> hwmon: add ST-Ericsson ABX500 hwmon driver
>
> Documentation/hwmon/ab8500 | 22 ++
> Documentation/hwmon/abx500 | 28 ++
> drivers/hwmon/Kconfig | 13 +
> drivers/hwmon/Makefile | 1 +
> drivers/hwmon/ab8500.c | 206 +++++++++++++++
> drivers/hwmon/abx500.c | 491 +++++++++++++++++++++++++++++++++++
> drivers/hwmon/abx500.h | 69 +++++
> drivers/power/ab8500_bmdata.c | 42 +--
> drivers/power/ab8500_btemp.c | 5 +-
> drivers/power/ab8500_fg.c | 4 +-
> include/linux/mfd/abx500.h | 6 +-
> include/linux/mfd/abx500/ab8500-bm.h | 5 +
> include/linux/power/ab8500.h | 16 ++
> 13 files changed, 885 insertions(+), 23 deletions(-)

The patches look good to me, but I wonder how would you like to proceed
with them? The thing is, it touches ab8500 code quite a lot, and since
battery-2.6 tree already has a lot of ab8500 changes, your patches
conflict quite badly.

Personally, I would like to take them all via battery-2.6.git tree to
avoid the conflicts, but for this I will need you to rebase the patches
onto it.

Thanks!

Anton

p.s. I couldn't apply the patches neither on v3.8, nor v3.9-rc4 nor on my
current battery-2.6.git tree... :-/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/