* linux-next: manual merge of the battery tree with Linus' tree
@ 2009-09-07 4:52 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-09-07 4:52 UTC (permalink / raw)
To: Anton Vorontsov
Cc: linux-next, linux-kernel, Marek Vasut, Alexander Beregalov,
Greg Kroah-Hartman
Hi Anton,
Today's linux-next merge of the battery tree got a conflict in
drivers/power/wm97xx_battery.c between commit
38c7dc373029e4666b17850054dd43c1c96bb264 ("wm97xx_batery: replace
driver_data with dev_get_drvdata()") from Linus' tree and commit
b8bdc1d0cfc488ac0d94724639f9a61b0a5a1d40 ("wm97xx_battery: Use
platform_data") from the battery tree.
Just context changes. I fixed it up (see below) and can carry the fixes
for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/power/wm97xx_battery.c
index b787335,c552082c..0000000
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@@ -33,14 -33,20 +33,20 @@@ static enum power_supply_property *prop
static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
{
+ struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+ struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
- return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+ return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
pdata->batt_aux) * pdata->batt_mult /
pdata->batt_div;
}
static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
{
+ struct wm97xx_pdata *wmdata = bat_ps->dev->parent->platform_data;
+ struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
+
- return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+ return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
pdata->temp_aux) * pdata->temp_mult /
pdata->temp_div;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the battery tree with Linus' tree
@ 2013-01-30 11:13 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-01-30 11:13 UTC (permalink / raw)
To: Anton Vorontsov
Cc: linux-next, linux-kernel, Lee Jones, Samuel Ortiz,
Johan Bjornstedt, Henrik Solver
[-- Attachment #1: Type: text/plain, Size: 1642 bytes --]
Hi Anton,
Today's linux-next merge of the battery tree got a conflict in
include/linux/mfd/abx500/ab8500-bm.h between commit 00441b5e6b98 ("mfd:
Fix compile errors and warnings when !CONFIG_AB8500_BM") from Linus' tree
and commit 3988a4df3499 ("ab8500_bm: Skip first CCEOC irq for instant
current") from the battery tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/mfd/abx500/ab8500-bm.h
index 9bd037d,e2a1e6d..0000000
--- a/include/linux/mfd/abx500/ab8500-bm.h
+++ b/include/linux/mfd/abx500/ab8500-bm.h
@@@ -437,8 -438,38 +441,13 @@@ int ab8500_fg_inst_curr_started(struct
int ab8500_fg_inst_curr_done(struct ab8500_fg *di);
#else
-int ab8500_fg_inst_curr_started(struct ab8500_fg *di)
-{
- return 0;
-}
+static struct abx500_bm_data ab8500_bm_data;
-int ab8500_fg_inst_curr_done(struct ab8500_fg *di)
-{
- return 0;
-}
-static void ab8500_fg_reinit(void)
-{
-}
-static void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA)
-{
-}
-static struct ab8500_btemp *ab8500_btemp_get(void)
-{
- return NULL;
-}
-static int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp)
++int ab8500_fg_inst_curr_started(struct ab8500_fg *di)
+ {
+ return 0;
+ }
-struct ab8500_fg *ab8500_fg_get(void)
-{
- return NULL;
-}
-static int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev)
-{
- return -ENODEV;
-}
+
static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di)
{
return -ENODEV;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the battery tree with Linus' tree
@ 2025-11-27 0:30 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-11-27 0:30 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Linus Torvalds, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Kubecek, Sebastian Reichel
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi all,
Today's linux-next merge of the battery tree got a conflict in:
drivers/power/supply/intel_dc_ti_battery.c
between commit:
ad8cccc24887 ("Fix Intel Dollar Cove TI battery driver 32-bit build error")
from Linus' tree and commit:
3fd1695f5da0 ("power: supply: use ktime_divns() to avoid 64-bit division")
from the battery tree.
I fixed it up (I just used Linus' version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-27 0:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-27 0:30 linux-next: manual merge of the battery tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-01-30 11:13 Stephen Rothwell
2009-09-07 4:52 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox