* linux-next: manual merge of the gpio tree with the regulator tree
@ 2012-02-03 2:44 Stephen Rothwell
2012-02-03 4:45 ` Laxman Dewangan
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-02-03 2:44 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Mark Brown, Liam Girdwood, Laxman Dewangan
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
include/linux/mfd/tps65910.h between commit 1e0c66f49762 ("regulator:
tps65910: Sleep control through external inputs") from the regulator tree
and commit 290705988073 ("gpio: tps65910: Add sleep control support")
from the gpio tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/mfd/tps65910.h
index fa6c6bf,9071902..0000000
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@@ -786,7 -786,7 +793,8 @@@ struct tps65910_board
int irq_base;
int vmbch_threshold;
int vmbch2_threshold;
+ unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS];
+ bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO];
struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS];
};
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the gpio tree with the regulator tree
2012-02-03 2:44 linux-next: manual merge of the gpio tree with the regulator tree Stephen Rothwell
@ 2012-02-03 4:45 ` Laxman Dewangan
0 siblings, 0 replies; 2+ messages in thread
From: Laxman Dewangan @ 2012-02-03 4:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Grant Likely, linux-next, linux-kernel, Mark Brown, Liam Girdwood
On Friday 03 February 2012 08:14 AM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> include/linux/mfd/tps65910.h between commit 1e0c66f49762 ("regulator:
> tps65910: Sleep control through external inputs") from the regulator tree
> and commit 290705988073 ("gpio: tps65910: Add sleep control support")
> from the gpio tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yes, merge is fine.. Thanks for taking care of conflicts.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-03 4:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-03 2:44 linux-next: manual merge of the gpio tree with the regulator tree Stephen Rothwell
2012-02-03 4:45 ` Laxman Dewangan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).