From: Liam Girdwood <lrg@slimlogic.co.uk>
To: Peter Ujfalusi <peter.ujfalusi@nokia.com>,
"Keski-Saari Juha.1 (EXT-Teleca/Helsinki)"
<ext-juha.1.keski-saari@nokia.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eduardo Valentin <eduardo.valentin@nokia.com>,
Rajendra Nayak <rnayak@ti.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Balaji T K <balajitk@ti.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the voltage tree with Linus' tree
Date: Tue, 15 Dec 2009 12:14:02 +0000 [thread overview]
Message-ID: <1260879242.3591.335.camel@odin> (raw)
In-Reply-To: <1260870485.3591.25.camel@odin>
On Tue, 2009-12-15 at 09:48 +0000, Liam Girdwood wrote:
> Hi Stephen,
>
> On Tue, 2009-12-15 at 13:38 +1100, Stephen Rothwell wrote:
> > Hi Liam,
> >
> > Today's linux-next merge of the voltage tree got a conflict in
> > drivers/regulator/twl-regulator.c between commit
> > 441a450554dada1c59fc06fdf068cb0eeba53c6d ("regulator: Add support for
> > twl6030 regulators") from Linus' tree and commits
> > 6360cf42ae51be5f6e6e72d6e81f202d9db0f7e9 ("twl4030-regulator: Remove
> > regulator from all groups when disabling") and
> > 3277b9fce0fcaa68d5947429e062163852ebc6fb ("twl4030-regulator: Add all TWL
> > regulators to twreg_info") from the voltage tree.
> >
> > I cannot begin to fix this mess up. I do wonder why the regulator patch
> > above was never in linux-next before being sent upstream yesterday
> > (Samuel?). All I can do is use the version of the voltage tree from
> > next-20091120 (commit id b0a7a2ad0aebb35934de6d2509c73fe93a362c0e) for
> > today and hope that Liam can do the merge with Linus' tree.
> >
>
> Sorry about this. There were some large patch sets that did span both
> mfd and regulator recently.
>
> I'll fix and do my pull request today.
Peter, Juha,
I've fixed up regulator for-next against upstream and now get a build
failure on twl-regulator.c (possibly related to mfd/twl-codec.c build
failure today ?)
CC drivers/regulator/twl-regulator.o
drivers/regulator/twl-regulator.c: In function ‘twlreg_disable’:
drivers/regulator/twl-regulator.c:158: error: ‘P1_GRP’ undeclared (first use in this function)
drivers/regulator/twl-regulator.c:158: error: (Each undeclared identifier is reported only once
drivers/regulator/twl-regulator.c:158: error: for each function it appears in.)
drivers/regulator/twl-regulator.c:158: error: ‘P2_GRP’ undeclared (first use in this function)
drivers/regulator/twl-regulator.c:158: error: ‘P3_GRP’ undeclared (first use in this function)
drivers/regulator/twl-regulator.c: At top level:
drivers/regulator/twl-regulator.c:358: error: ‘twlldo_list_voltage’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:450:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:450: error: ‘TWL_ADJUSTABLE_LDO’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:451:40: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:452:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:453:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:454:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:455:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:456:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:457:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:458:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:459:34: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:460:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:461:40: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:461: error: ‘TWL_FIXED_LDO’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:462:39: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:463:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:464:34: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:465:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:466:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:467:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:468:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:469:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:474: error: ‘VAUX1_6030_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:474: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:474: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:474: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:474: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:474: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:474: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:475: error: ‘VAUX2_6030_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:475: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:475: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:475: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:475: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:475: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:475: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:476: error: ‘VAUX3_6030_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:476: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:476: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:476: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:476: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:476: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:476: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:477: error: ‘VMMC_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:477: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:477: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:477: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:477: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:477: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:477: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:478: error: ‘VPP_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:478: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:478: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:478: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:478: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:478: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:478: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:479: error: ‘VUSIM_VSEL_table’ undeclared here (not in a function)
drivers/regulator/twl-regulator.c:479: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:479: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:479: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c:479: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:479: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/regulator/twl-regulator.c:479: error: negative width in bit-field ‘<anonymous>’
drivers/regulator/twl-regulator.c: In function ‘twlreg_probe’:
drivers/regulator/twl-regulator.c:544: error: implicit declaration of function ‘twl4030reg_write’
make[2]: *** [drivers/regulator/twl-regulator.o] Error 1
make[1]: *** [drivers/regulator] Error 2
make: *** [drivers] Error 2
Can you check this and send me patch before I issue a pull request.
Fwiw, the regulator pull request is now blocking on this issue.
Thanks.
Liam
next prev parent reply other threads:[~2009-12-15 12:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 2:38 linux-next: manual merge of the voltage tree with Linus' tree Stephen Rothwell
2009-12-15 9:48 ` Liam Girdwood
2009-12-15 12:14 ` Liam Girdwood [this message]
2009-12-15 14:04 ` Juha Keski-Saari
2009-12-15 14:23 ` Peter Ujfalusi
-- strict thread matches above, loose matches on Subject: below --
2009-12-15 1:59 Stephen Rothwell
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=1260879242.3591.335.camel@odin \
--to=lrg@slimlogic.co.uk \
--cc=balajitk@ti.com \
--cc=eduardo.valentin@nokia.com \
--cc=ext-juha.1.keski-saari@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.ujfalusi@nokia.com \
--cc=rnayak@ti.com \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox