2019-06-28 04:03:35

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the battery tree

Hi all,

After merging the battery tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/power/supply/wilco-charger.c: In function 'wilco_charge_get_property':
drivers/power/supply/wilco-charger.c:104:8: error: implicit declaration of function 'wilco_ec_get_byte_property'; did you mean 'wilco_charge_get_property'? [-Werror=implicit-function-declaration]
ret = wilco_ec_get_byte_property(ec, property_id, &raw);
^~~~~~~~~~~~~~~~~~~~~~~~~~
wilco_charge_get_property
drivers/power/supply/wilco-charger.c: In function 'wilco_charge_set_property':
drivers/power/supply/wilco-charger.c:130:10: error: implicit declaration of function 'wilco_ec_set_byte_property'; did you mean 'wilco_charge_set_property'? [-Werror=implicit-function-declaration]
return wilco_ec_set_byte_property(ec, PID_CHARGE_MODE, mode);
^~~~~~~~~~~~~~~~~~~~~~~~~~
wilco_charge_set_property

Caused by commit

0736343e4c56 ("power_supply: wilco_ec: Add charging config driver")

I have reverted that commit for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-06-28 15:32:14

by Sebastian Reichel

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the battery tree

Hi,

On Fri, Jun 28, 2019 at 02:03:04PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the battery tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/power/supply/wilco-charger.c: In function 'wilco_charge_get_property':
> drivers/power/supply/wilco-charger.c:104:8: error: implicit declaration of function 'wilco_ec_get_byte_property'; did you mean 'wilco_charge_get_property'? [-Werror=implicit-function-declaration]
> ret = wilco_ec_get_byte_property(ec, property_id, &raw);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~
> wilco_charge_get_property
> drivers/power/supply/wilco-charger.c: In function 'wilco_charge_set_property':
> drivers/power/supply/wilco-charger.c:130:10: error: implicit declaration of function 'wilco_ec_set_byte_property'; did you mean 'wilco_charge_set_property'? [-Werror=implicit-function-declaration]
> return wilco_ec_set_byte_property(ec, PID_CHARGE_MODE, mode);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~
> wilco_charge_set_property
>
> Caused by commit
>
> 0736343e4c56 ("power_supply: wilco_ec: Add charging config driver")
>
> I have reverted that commit for today.

Oops, thanks for the hint. I did not notice this with ARM
allmodconfig. I dropped the patch for this cycle.

-- Sebastian


Attachments:
(No filename) (1.29 kB)
signature.asc (849.00 B)
Download all attachments

2019-06-28 16:59:23

by Enric Balletbo i Serra

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the battery tree

Hi,

On 28/6/19 17:31, Sebastian Reichel wrote:
> Hi,
>
> On Fri, Jun 28, 2019 at 02:03:04PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the battery tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/power/supply/wilco-charger.c: In function 'wilco_charge_get_property':
>> drivers/power/supply/wilco-charger.c:104:8: error: implicit declaration of function 'wilco_ec_get_byte_property'; did you mean 'wilco_charge_get_property'? [-Werror=implicit-function-declaration]
>> ret = wilco_ec_get_byte_property(ec, property_id, &raw);
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> wilco_charge_get_property
>> drivers/power/supply/wilco-charger.c: In function 'wilco_charge_set_property':
>> drivers/power/supply/wilco-charger.c:130:10: error: implicit declaration of function 'wilco_ec_set_byte_property'; did you mean 'wilco_charge_set_property'? [-Werror=implicit-function-declaration]
>> return wilco_ec_set_byte_property(ec, PID_CHARGE_MODE, mode);
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> wilco_charge_set_property
>>
>> Caused by commit
>>
>> 0736343e4c56 ("power_supply: wilco_ec: Add charging config driver")
>>

Hmm, I just applied this patch on top of linux-next and it build with
allmodconfig on x86_64

I am wondering if the build was done without this commit, which is in
chrome-platform for-next branch. Could be this the problem?

commit 0c0b7ea23aed0b55ef2f9803f13ddaae1943713d
Author: Nick Crews <[email protected]>
Date: Wed Apr 24 10:56:50 2019 -0600

platform/chrome: wilco_ec: Add property helper library


Anyway, I think the proper way to do it is create an immutable branch for
Sebastian as the patch he picked depends on the above commit. I'll create one,
sorry about that missing dependency.

Thanks,
~ Enric


>> I have reverted that commit for today.
>
> Oops, thanks for the hint. I did not notice this with ARM
> allmodconfig. I dropped the patch for this cycle.
>
> -- Sebastian
>

2019-06-29 00:34:14

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the battery tree

Hi Enric,

On Fri, 28 Jun 2019 18:56:56 +0200 Enric Balletbo i Serra <[email protected]> wrote:
>
> Hmm, I just applied this patch on top of linux-next and it build with
> allmodconfig on x86_64
>
> I am wondering if the build was done without this commit, which is in
> chrome-platform for-next branch. Could be this the problem?
>
> commit 0c0b7ea23aed0b55ef2f9803f13ddaae1943713d
> Author: Nick Crews <[email protected]>
> Date: Wed Apr 24 10:56:50 2019 -0600
>
> platform/chrome: wilco_ec: Add property helper library

Exactly since I merge the battery tree before the chrome-platform
tree ... Cross tree dependencies are a pain.

> Anyway, I think the proper way to do it is create an immutable branch for
> Sebastian as the patch he picked depends on the above commit. I'll create one,
> sorry about that missing dependency.

Thanks.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-07-01 15:16:56

by Enric Balletbo i Serra

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the battery tree

Hi Sebastian,

In case is not too late for you. Otherwise we will need to wait for next cycle.

The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:

Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
tags/ib-chrome-psy-5.3

for you to fetch changes up to 0c0b7ea23aed0b55ef2f9803f13ddaae1943713d:

platform/chrome: wilco_ec: Add property helper library (2019-05-20 10:18:09 +0200)

----------------------------------------------------------------
Immutable branch between Power Supply and Chrome Platform due for the v5.3 merge
window

----------------------------------------------------------------
Nick Crews (1):
platform/chrome: wilco_ec: Add property helper library

drivers/platform/chrome/wilco_ec/Makefile | 2 +-
drivers/platform/chrome/wilco_ec/properties.c | 132 ++++++++++++++++++++++++++
include/linux/platform_data/wilco-ec.h | 71 ++++++++++++++
3 files changed, 204 insertions(+), 1 deletion(-)
create mode 100644 drivers/platform/chrome/wilco_ec/properties.c



On 29/6/19 2:33, Stephen Rothwell wrote:
> Hi Enric,
>
> On Fri, 28 Jun 2019 18:56:56 +0200 Enric Balletbo i Serra <[email protected]> wrote:
>>
>> Hmm, I just applied this patch on top of linux-next and it build with
>> allmodconfig on x86_64
>>
>> I am wondering if the build was done without this commit, which is in
>> chrome-platform for-next branch. Could be this the problem?
>>
>> commit 0c0b7ea23aed0b55ef2f9803f13ddaae1943713d
>> Author: Nick Crews <[email protected]>
>> Date: Wed Apr 24 10:56:50 2019 -0600
>>
>> platform/chrome: wilco_ec: Add property helper library
>
> Exactly since I merge the battery tree before the chrome-platform
> tree ... Cross tree dependencies are a pain.
>
>> Anyway, I think the proper way to do it is create an immutable branch for
>> Sebastian as the patch he picked depends on the above commit. I'll create one,
>> sorry about that missing dependency.
>
> Thanks.
>