LKML Archive on lore.kernel.org
 help / Atom feed
* linux-next: build failure after merge of the thermal tree
@ 2018-12-07  1:24 Stephen Rothwell
  2018-12-07  6:57 ` Amit Kucheria
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2018-12-07  1:24 UTC (permalink / raw)
  To: Zhang Rui
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Amit Kucheria

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

Hi Zhang,

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

drivers/thermal/qcom/qcom-spmi-temp-alarm.c:26:10: fatal error: thermal_core.h: No such file or directory
 #include "thermal_core.h"
          ^~~~~~~~~~~~~~~~

Caused by commit

  150a4fe8c335 ("drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir")

I have used the thermal tree from next-20181206 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2018-12-07  1:24 linux-next: build failure after merge of the thermal tree Stephen Rothwell
@ 2018-12-07  6:57 ` Amit Kucheria
  0 siblings, 0 replies; 13+ messages in thread
From: Amit Kucheria @ 2018-12-07  6:57 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Zhang Rui, linux-next, LKML

Hi Stephen, Rui,

On Fri, Dec 7, 2018 at 6:55 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Zhang,
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/thermal/qcom/qcom-spmi-temp-alarm.c:26:10: fatal error: thermal_core.h: No such file or directory
>  #include "thermal_core.h"
>           ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   150a4fe8c335 ("drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir")

Apologies for the build error. My scripts failed to enable the config
and test it correctly. There was bug on where the .config file ended
up. I've fixed it and sent v4 of the patches. Please consider applying
them instead.

Regards,
Amit

> I have used the thermal tree from next-20181206 for today.
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2018-06-08  0:51 Stephen Rothwell
@ 2018-06-08  1:07 ` Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2018-06-08  1:07 UTC (permalink / raw)
  To: Zhang Rui
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook,
	Bjorn Andersson, Eduardo Valentin, Andrew Morton

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

Hi all,

On Fri, 8 Jun 2018 10:51:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
> drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
>          num_sensors * sizeof(*s), GFP_KERNEL);
>                                ^
> 
> Caused by commit
> 
>   6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")
> 
> interacting with commit
> 
>   0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")
> 
> from Linus' tree.  It looks like git somehow screwed up the automatic
> conflict resolution.

OK, this was caused by a bad rerere entry in my tree (from my recent import of Andrew's mmotm patch series).  Sorry about that, I have fixed it up.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: build failure after merge of the thermal tree
@ 2018-06-08  0:51 Stephen Rothwell
  2018-06-08  1:07 ` Stephen Rothwell
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2018-06-08  0:51 UTC (permalink / raw)
  To: Zhang Rui
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook,
	Bjorn Andersson, Eduardo Valentin

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

Hi Zhang,

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

drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
         num_sensors * sizeof(*s), GFP_KERNEL);
                               ^

Caused by commit

  6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")

interacting with commit

  0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")

from Linus' tree.  It looks like git somehow screwed up the automatic
conflict resolution.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Jun 2018 10:46:46 +1000
Subject: [PATCH] thermal: gcom: fix up bad git conflict resolution

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/qcom/tsens.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index fb8c87f55240..6164fd36dda3 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -140,8 +140,8 @@ static int tsens_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
-			     num_sensors * sizeof(*s), GFP_KERNEL);
+	tmdev = devm_kzalloc(dev, struct_size(tmdev, sensor, num_sensors),
+			     GFP_KERNEL);
 	if (!tmdev)
 		return -ENOMEM;
 
-- 
2.17.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2014-12-09  2:31 ` Aaron Lu
@ 2014-12-09  2:32   ` Zhang Rui
  0 siblings, 0 replies; 13+ messages in thread
From: Zhang Rui @ 2014-12-09  2:32 UTC (permalink / raw)
  To: Aaron Lu; +Cc: Stephen Rothwell, linux-next, linux-kernel

On Tue, 2014-12-09 at 10:31 +0800, Aaron Lu wrote:
> Sorry for the trouble.
> 
> Hi Rui,
> 
> Please let me know if you want an update to the original patch
> or an incremental one.
> 
updated one
> Thanks,
> Aaron
> 
> On 12/09/2014 10:17 AM, Stephen Rothwell wrote:
> > Hi Zhang,
> > 
> > After merging the thermal tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"
> > 
> > Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
> > driver").  Presumable a new file was missed.
> > 
> > I have used teh thermal tree from next-20141208 for today.
> > 
> 



^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2014-12-09  2:17 Stephen Rothwell
@ 2014-12-09  2:31 ` Aaron Lu
  2014-12-09  2:32   ` Zhang Rui
  0 siblings, 1 reply; 13+ messages in thread
From: Aaron Lu @ 2014-12-09  2:31 UTC (permalink / raw)
  To: Stephen Rothwell, Zhang Rui; +Cc: linux-next, linux-kernel

Sorry for the trouble.

Hi Rui,

Please let me know if you want an update to the original patch
or an incremental one.

Thanks,
Aaron

On 12/09/2014 10:17 AM, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"
> 
> Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
> driver").  Presumable a new file was missed.
> 
> I have used teh thermal tree from next-20141208 for today.
> 


^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: build failure after merge of the thermal tree
@ 2014-12-09  2:17 Stephen Rothwell
  2014-12-09  2:31 ` Aaron Lu
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2014-12-09  2:17 UTC (permalink / raw)
  To: Zhang Rui; +Cc: linux-next, linux-kernel, Aaron Lu

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

Hi Zhang,

After merging the thermal tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/thermal/Kconfig:265: can't open file "drivers/thermal/int340x_thermal/Kconfig"

Caused by commit 4152c8bc018d ("Thermal: introduce INT3406 thermal
driver").  Presumable a new file was missed.

I have used teh thermal tree from next-20141208 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: build failure after merge of the thermal tree
@ 2014-10-16  1:53 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2014-10-16  1:53 UTC (permalink / raw)
  To: Zhang Rui; +Cc: linux-next, linux-kernel

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

Hi Zhang,

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

drivers/thermal/thermal_core.c:1183:1: error: redefinition of 'thermal_cooling_device_register'
 thermal_cooling_device_register(char *type, void *devdata,
 ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:345:46: note: previous definition of 'thermal_cooling_device_register' was here
 static inline struct thermal_cooling_device *thermal_cooling_device_register(
                                              ^
drivers/thermal/thermal_core.c:1221:6: error: redefinition of 'thermal_cooling_device_unregister'
 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
      ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:351:20: note: previous definition of 'thermal_cooling_device_unregister' was here
 static inline void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
                    ^

Caused by commit 571ed5a8177a ("Thermal: int340x thermal: fix a Kconfig
dependency error").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2014-10-10  1:14 Stephen Rothwell
@ 2014-10-10  8:19 ` Zhang Rui
  0 siblings, 0 replies; 13+ messages in thread
From: Zhang Rui @ 2014-10-10  8:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Fri, 2014-10-10 at 12:14 +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from /scratch/sfr/next/init/main.c:27:0:
> /scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
> /scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
>      struct acpi_device *)
>             ^
> In file included from /scratch/sfr/next/drivers/i2c/i2c-core.c:54:0:
> /scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
> /scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
>      struct acpi_device *)
>             ^
> 
> And so on ...
> 
> Caused by commit 55fe2ff57c7e ("ACPI: make
> acpi_create_platform_device() an external API").  This build does not
> have CONFIG_ACPI set.  This has come along a bit late. :-(
> 
> I have used the thermal tree from next-20141009 for today.

I've fixed the problem in my tree. Please re-pull.

thanks,
rui


^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: build failure after merge of the thermal tree
@ 2014-10-10  1:14 Stephen Rothwell
  2014-10-10  8:19 ` Zhang Rui
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2014-10-10  1:14 UTC (permalink / raw)
  To: Zhang Rui; +Cc: linux-next, linux-kernel

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

Hi Zhang,

After merging the thermal tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from /scratch/sfr/next/init/main.c:27:0:
/scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
/scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
     struct acpi_device *)
            ^
In file included from /scratch/sfr/next/drivers/i2c/i2c-core.c:54:0:
/scratch/sfr/next/include/linux/acpi.h: In function 'acpi_create_platform_device':
/scratch/sfr/next/include/linux/acpi.h:528:12: error: parameter name omitted
     struct acpi_device *)
            ^

And so on ...

Caused by commit 55fe2ff57c7e ("ACPI: make
acpi_create_platform_device() an external API").  This build does not
have CONFIG_ACPI set.  This has come along a bit late. :-(

I have used the thermal tree from next-20141009 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: linux-next: build failure after merge of the thermal tree
  2012-10-08  0:02 Stephen Rothwell
  2012-10-08  2:14 ` Zhang, Rui
@ 2012-10-09  2:11 ` Fengguang Wu
  1 sibling, 0 replies; 13+ messages in thread
From: Fengguang Wu @ 2012-10-09  2:11 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Zhang Rui, linux-next, linux-kernel, Amit Daniel Kachhap, Andrew Morton

On Mon, Oct 08, 2012 at 11:02:05AM +1100, Stephen Rothwell wrote:
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/cpu_cooling.c: In function 'get_idr':
> drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function)
> 
> Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
> implementation") interacting with commit 125c4c706b68 ("idr: rename
> MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.
> 
> I have applied the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Oct 2012 10:56:56 +1100
> Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename

Thank you Stephen! Sorry for all the troubles on the rename..

Thanks,
Fengguang

^ permalink raw reply	[flat|nested] 13+ messages in thread

* RE: linux-next: build failure after merge of the thermal tree
  2012-10-08  0:02 Stephen Rothwell
@ 2012-10-08  2:14 ` Zhang, Rui
  2012-10-09  2:11 ` Fengguang Wu
  1 sibling, 0 replies; 13+ messages in thread
From: Zhang, Rui @ 2012-10-08  2:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Amit Daniel Kachhap, Wu, Fengguang,
	Andrew Morton

Hi,

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, October 08, 2012 8:02 AM
> To: Zhang, Rui
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Amit
> Daniel Kachhap; Wu, Fengguang; Andrew Morton
> Subject: linux-next: build failure after merge of the thermal tree
> Importance: High
> 
> Hi Zhang,
> 
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/cpu_cooling.c: In function 'get_idr':
> drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared
> (first use in this function)
> 
> Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
> implementation") interacting with commit 125c4c706b68 ("idr: rename
> MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.
> 
> I have applied the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Oct 2012 10:56:56 +1100
> Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK
> rename
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

The patch looks good to me, thanks for the fix.

-rui
> ---
>  drivers/thermal/cpu_cooling.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/cpu_cooling.c
> b/drivers/thermal/cpu_cooling.c index 9050c1b..cc1c930 100644
> --- a/drivers/thermal/cpu_cooling.c
> +++ b/drivers/thermal/cpu_cooling.c
> @@ -86,7 +86,7 @@ again:
>  	else if (unlikely(err))
>  		return err;
> 
> -	*id = *id & MAX_ID_MASK;
> +	*id = *id & MAX_IDR_MASK;
>  	return 0;
>  }
> 
> --
> 1.7.10.280.gaa39
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 13+ messages in thread

* linux-next: build failure after merge of the thermal tree
@ 2012-10-08  0:02 Stephen Rothwell
  2012-10-08  2:14 ` Zhang, Rui
  2012-10-09  2:11 ` Fengguang Wu
  0 siblings, 2 replies; 13+ messages in thread
From: Stephen Rothwell @ 2012-10-08  0:02 UTC (permalink / raw)
  To: Zhang Rui
  Cc: linux-next, linux-kernel, Amit Daniel Kachhap, Fengguang Wu,
	Andrew Morton

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

Hi Zhang,

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

drivers/thermal/cpu_cooling.c: In function 'get_idr':
drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function)

Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
implementation") interacting with commit 125c4c706b68 ("idr: rename
MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.

I have applied the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 10:56:56 +1100
Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/thermal/cpu_cooling.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 9050c1b..cc1c930 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -86,7 +86,7 @@ again:
 	else if (unlikely(err))
 		return err;
 
-	*id = *id & MAX_ID_MASK;
+	*id = *id & MAX_IDR_MASK;
 	return 0;
 }
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, back to index

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-07  1:24 linux-next: build failure after merge of the thermal tree Stephen Rothwell
2018-12-07  6:57 ` Amit Kucheria
  -- strict thread matches above, loose matches on Subject: below --
2018-06-08  0:51 Stephen Rothwell
2018-06-08  1:07 ` Stephen Rothwell
2014-12-09  2:17 Stephen Rothwell
2014-12-09  2:31 ` Aaron Lu
2014-12-09  2:32   ` Zhang Rui
2014-10-16  1:53 Stephen Rothwell
2014-10-10  1:14 Stephen Rothwell
2014-10-10  8:19 ` Zhang Rui
2012-10-08  0:02 Stephen Rothwell
2012-10-08  2:14 ` Zhang, Rui
2012-10-09  2:11 ` Fengguang Wu

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox