All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anton Vorontsov <anton@enomsg.org>
To: Hongbo Zhang <hongbo.zhang@linaro.org>
Cc: linux@roeck-us.net, khali@linux-fr.org,
	lm-sensors@lm-sensors.org, dwmw2@infradead.org,
	linaro-kernel@lists.linaro.org,
	STEricsson_nomadik_linux@list.st.com, linus.walleij@linaro.org,
	lee.jones@linaro.org, linux-kernel@vger.kernel.org
Subject: Re: [lm-sensors] [PATCH v7 0/5] Add ST-Ericsson AB8500 HWMON driver
Date: Sat, 30 Mar 2013 23:13:46 +0000	[thread overview]
Message-ID: <20130330231345.GA28021@lizard> (raw)
In-Reply-To: <1364368412-12810-1-git-send-email-hongbo.zhang@linaro.org>

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... :-/

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

WARNING: multiple messages have this Message-ID (diff)
From: Anton Vorontsov <anton@enomsg.org>
To: Hongbo Zhang <hongbo.zhang@linaro.org>
Cc: linux@roeck-us.net, khali@linux-fr.org,
	lm-sensors@lm-sensors.org, dwmw2@infradead.org,
	linaro-kernel@lists.linaro.org,
	STEricsson_nomadik_linux@list.st.com, linus.walleij@linaro.org,
	lee.jones@linaro.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 0/5] Add ST-Ericsson AB8500 HWMON driver
Date: Sat, 30 Mar 2013 16:13:46 -0700	[thread overview]
Message-ID: <20130330231345.GA28021@lizard> (raw)
In-Reply-To: <1364368412-12810-1-git-send-email-hongbo.zhang@linaro.org>

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... :-/

  parent reply	other threads:[~2013-03-30 23:13 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-27  7:13 [lm-sensors] [PATCH v7 0/5] Add ST-Ericsson AB8500 HWMON driver Hongbo Zhang
2013-03-27  7:13 ` Hongbo Zhang
2013-03-27  7:13 ` [lm-sensors] [PATCH v7 1/5] ab8500_btemp: make ab8500_btemp_get* interfaces public Hongbo Zhang
2013-03-27  7:13   ` Hongbo Zhang
2013-03-27  7:13 ` [lm-sensors] [PATCH v7 2/5] ab8500: power: eliminate CamelCase warning of some variables Hongbo Zhang
2013-03-27  7:13   ` Hongbo Zhang
2013-03-27  7:13 ` [lm-sensors] [PATCH v7 3/5] ab8500: power: add const attributes to some data arrays Hongbo Zhang
2013-03-27  7:13   ` Hongbo Zhang
2013-03-27  7:13 ` [lm-sensors] [PATCH v7 4/5] ab8500: power: export abx500_res_to_temp tables for hwmon Hongbo Zhang
2013-03-27  7:13   ` Hongbo Zhang
2013-03-27 19:47   ` [lm-sensors] " Guenter Roeck
2013-03-27 19:47     ` Guenter Roeck
2013-03-27  7:13 ` [lm-sensors] [PATCH v7 5/5] hwmon: add ST-Ericsson ABX500 hwmon driver Hongbo Zhang
2013-03-27  7:13   ` Hongbo Zhang
2013-03-27 19:48   ` [lm-sensors] " Guenter Roeck
2013-03-27 19:48     ` Guenter Roeck
2013-03-28  2:31     ` [lm-sensors] " Hongbo Zhang
2013-03-28  2:31       ` Hongbo Zhang
2013-03-30 23:18     ` [lm-sensors] " Anton Vorontsov
2013-03-30 23:18       ` Anton Vorontsov
2013-03-30 23:27       ` [lm-sensors] " Guenter Roeck
2013-03-30 23:27         ` Guenter Roeck
2013-03-31 19:59         ` [lm-sensors] " Anton Vorontsov
2013-03-31 19:59           ` Anton Vorontsov
2013-04-01 11:18   ` [lm-sensors] " Hongbo Zhang
2013-03-30 23:13 ` Anton Vorontsov [this message]
2013-03-30 23:13   ` [PATCH v7 0/5] Add ST-Ericsson AB8500 HWMON driver Anton Vorontsov
2013-04-01 11:21 ` [lm-sensors] " Hongbo Zhang

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=20130330231345.GA28021@lizard \
    --to=anton@enomsg.org \
    --cc=STEricsson_nomadik_linux@list.st.com \
    --cc=dwmw2@infradead.org \
    --cc=hongbo.zhang@linaro.org \
    --cc=khali@linux-fr.org \
    --cc=lee.jones@linaro.org \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.