linux-next: manual merge of the battery tree

linux-next: manual merge of the battery tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

Hi Anton,

Today's linux-next merge of the battery tree got trivial conflicts in
drivers/power/Makefile and drivers/power/Kconfig between commit
7bd66c73ec75711cec7446c6f6822494c1afd951 ("[ARM] 5155/1: PalmTX battery
monitor") from the arm tree and commit
fece418418f51e92dd7e67e17c5e3fe5a28d3279 ("power_supply: Sharp SL-6000
(tosa) batteries support") from the battery tree.

Just a case of overlapping additions.  I took both and can carry the
fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the battery tree

[Anton Vorontsov]

On Tue, Jul 08, 2008 at 04:13:17PM +1000, Stephen Rothwell wrote:
> Hi Anton,
> 
> Today's linux-next merge of the battery tree got trivial conflicts in
> drivers/power/Makefile and drivers/power/Kconfig between commit
> 7bd66c73ec75711cec7446c6f6822494c1afd951 ("[ARM] 5155/1: PalmTX battery
> monitor") from the arm tree and commit
> fece418418f51e92dd7e67e17c5e3fe5a28d3279 ("power_supply: Sharp SL-6000
> (tosa) batteries support") from the battery tree.

Stephen, much thanks for the notice.


Russell, what should we do? I can either:

1. pick up the driver that ought to be applied through the battery-2.6.git,
   thus you can drop it from the arm tree.

2. or, we leave the conflict as is. Then, when the merge window opens,
   you'll push the arm tree to Linus, then I'll pull from Linus' tree
   [will fix the conflict meanwhile] and then I'll ask Linus to pull
   the fixed battery-2.6.git.

I don't have any preference, so I'll do whatever you prefer.

Thanks,

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2

linux-next: manual merge of the battery tree

[Stephen Rothwell]

Hi Anton,

Today's linux-next merge of the battery tree got a conflict in
drivers/power/Makefile between commit
4e9687d9c843dc34d368358a36f5f1610e4fbab3 ("[ARM] 5248/1: wm97xx generic
battery driver") from Linus' tree and commit
b996ad0e9fb15ca4acc60bcd0380912117a45d13 ("power_supply: Support for
Texas Instruments BQ27200 battery managers") from the battery tree.

Just overlapping addition/change.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/power/Makefile
index 4e20026,6cb301b..0000000
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -21,4 -21,5 +21,5 @@@ obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_
  obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o
  obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
  obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
- obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
 -obj-$(CONFIG_BATTERY_PALMTX)	+= palmtx_battery.o
++obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
+ obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o