* linux-next: build failure after merge of the iio tree
@ 2024-10-11 4:42 Stephen Rothwell
2024-10-11 9:42 ` Jonathan Cameron
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-10-11 4:42 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Abhash Jha, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1989 bytes --]
Hi all,
After merging the iio tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/iio/dac/ad5770r.c:20:10: fatal error: asm/unaligned.h: No such file or directory
20 | #include <asm/unaligned.h>
| ^~~~~~~~~~~~~~~~~
drivers/iio/adc/max1363.c:37:10: fatal error: asm/unaligned.h: No such file or directory
37 | #include <asm/unaligned.h>
| ^~~~~~~~~~~~~~~~~
Caused by commits
c2c4826cfa46 ("iio: adc: max1363: Convert to get_unaligned_be16")
0f87813bc338 ("iio: dac: ad5770r: Convert to get_unaligned_le16")
interacting with commit
5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
from Linus' tree (in v6.12-rc2).
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Oct 2024 15:35:57 +1100
Subject: [PATCH] fix up for asm/unaligned inclusions in ad5770r.c and max1363.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/iio/adc/max1363.c | 2 +-
drivers/iio/dac/ad5770r.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index d59cd638db96..d065b1ade95a 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -34,7 +34,7 @@
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#define MAX1363_SETUP_BYTE(a) ((a) | 0x80)
diff --git a/drivers/iio/dac/ad5770r.c b/drivers/iio/dac/ad5770r.c
index 12c98f3e62a5..7d7f5110d66a 100644
--- a/drivers/iio/dac/ad5770r.c
+++ b/drivers/iio/dac/ad5770r.c
@@ -17,7 +17,7 @@
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/spi/spi.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#define ADI_SPI_IF_CONFIG_A 0x00
#define ADI_SPI_IF_CONFIG_B 0x01
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the iio tree
2024-10-11 4:42 linux-next: build failure after merge of the iio tree Stephen Rothwell
@ 2024-10-11 9:42 ` Jonathan Cameron
2024-10-11 12:09 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Jonathan Cameron @ 2024-10-11 9:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Abhash Jha, Linux Kernel Mailing List, Linux Next Mailing List,
gregkh
On Fri, 11 Oct 2024 15:42:41 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
Thanks Stephen,
I'll call these out (I think we have 3 of them now) when I send Greg a pull request as
probably best place to tidy this up is when merging into char-misc which has
merged rc2 with Al's patch.
Greg, let me know if you'd rather I handled these in the iio tree
(probably a merge of rc2 as I'd rather not rebase)
Jonathan
> After merging the iio tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/iio/dac/ad5770r.c:20:10: fatal error: asm/unaligned.h: No such file or directory
> 20 | #include <asm/unaligned.h>
> | ^~~~~~~~~~~~~~~~~
> drivers/iio/adc/max1363.c:37:10: fatal error: asm/unaligned.h: No such file or directory
> 37 | #include <asm/unaligned.h>
> | ^~~~~~~~~~~~~~~~~
>
> Caused by commits
>
> c2c4826cfa46 ("iio: adc: max1363: Convert to get_unaligned_be16")
> 0f87813bc338 ("iio: dac: ad5770r: Convert to get_unaligned_le16")
>
> interacting with commit
>
> 5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
>
> from Linus' tree (in v6.12-rc2).
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 11 Oct 2024 15:35:57 +1100
> Subject: [PATCH] fix up for asm/unaligned inclusions in ad5770r.c and max1363.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/iio/adc/max1363.c | 2 +-
> drivers/iio/dac/ad5770r.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
> index d59cd638db96..d065b1ade95a 100644
> --- a/drivers/iio/adc/max1363.c
> +++ b/drivers/iio/adc/max1363.c
> @@ -34,7 +34,7 @@
> #include <linux/iio/trigger_consumer.h>
> #include <linux/iio/triggered_buffer.h>
>
> -#include <asm/unaligned.h>
> +#include <linux/unaligned.h>
>
> #define MAX1363_SETUP_BYTE(a) ((a) | 0x80)
>
> diff --git a/drivers/iio/dac/ad5770r.c b/drivers/iio/dac/ad5770r.c
> index 12c98f3e62a5..7d7f5110d66a 100644
> --- a/drivers/iio/dac/ad5770r.c
> +++ b/drivers/iio/dac/ad5770r.c
> @@ -17,7 +17,7 @@
> #include <linux/regmap.h>
> #include <linux/regulator/consumer.h>
> #include <linux/spi/spi.h>
> -#include <asm/unaligned.h>
> +#include <linux/unaligned.h>
>
> #define ADI_SPI_IF_CONFIG_A 0x00
> #define ADI_SPI_IF_CONFIG_B 0x01
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the iio tree
2024-10-11 9:42 ` Jonathan Cameron
@ 2024-10-11 12:09 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2024-10-11 12:09 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Stephen Rothwell, Abhash Jha, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Oct 11, 2024 at 10:42:32AM +0100, Jonathan Cameron wrote:
> On Fri, 11 Oct 2024 15:42:41 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi all,
> >
> Thanks Stephen,
>
> I'll call these out (I think we have 3 of them now) when I send Greg a pull request as
> probably best place to tidy this up is when merging into char-misc which has
> merged rc2 with Al's patch.
>
> Greg, let me know if you'd rather I handled these in the iio tree
> (probably a merge of rc2 as I'd rather not rebase)
In your tree is fine with me!
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the iio tree
@ 2024-10-08 4:41 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2024-10-08 4:41 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Al Viro, Abhash Jha, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]
Hi all,
After merging the iio tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/iio/proximity/vl53l0x-i2c.c:30:10: fatal error: asm/unaligned.h: No such file or directory
30 | #include <asm/unaligned.h>
| ^~~~~~~~~~~~~~~~~
Caused by commit
762186c6e7b1 ("iio: proximity: vl53l0x-i2c: Added continuous mode support")
interatcing with commit
5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
from Linus' tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Oct 2024 15:31:23 +1100
Subject: [PATCH] fix up for "iio: proximity: vl53l0x-i2c: Added continuous
mode support"
interacting with commit
5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
from Linus' tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/iio/proximity/vl53l0x-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/proximity/vl53l0x-i2c.c b/drivers/iio/proximity/vl53l0x-i2c.c
index 5a137859c2b6..bd076b2c9d95 100644
--- a/drivers/iio/proximity/vl53l0x-i2c.c
+++ b/drivers/iio/proximity/vl53l0x-i2c.c
@@ -27,7 +27,7 @@
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#define VL_REG_SYSRANGE_START 0x00
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* linux-next: build failure after merge of the iio tree
@ 2023-02-09 3:38 Stephen Rothwell
2023-02-09 10:20 ` Jonathan Cameron
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-02-09 3:38 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Gwendal Grignou, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]
Hi all,
After merging the iio tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/iio/proximity/sx_common.c: In function 'sx_common_get_raw_register_config':
drivers/iio/proximity/sx_common.c:438:55: error: implicit declaration of function 'acpi_device_hid'; did you mean 'dmi_device_id'? [-Werror=implicit-function-declaration]
438 | snprintf(prop, ARRAY_SIZE(prop), "%s,reg_%s", acpi_device_hid(adev), reg_def->property);
| ^~~~~~~~~~~~~~~
| dmi_device_id
drivers/iio/proximity/sx_common.c:438:44: error: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Werror=format=]
438 | snprintf(prop, ARRAY_SIZE(prop), "%s,reg_%s", acpi_device_hid(adev), reg_def->property);
| ~^ ~~~~~~~~~~~~~~~~~~~~~
| | |
| char * int
| %d
cc1: all warnings being treated as errors
Caused by commit
91af1d6c497b ("iio: proximity: sx_common: Add old register mapping")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the iio tree
2023-02-09 3:38 Stephen Rothwell
@ 2023-02-09 10:20 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2023-02-09 10:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Gwendal Grignou, Linux Kernel Mailing List,
Linux Next Mailing List
On Thu, 9 Feb 2023 14:38:21 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the iio tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/iio/proximity/sx_common.c: In function 'sx_common_get_raw_register_config':
> drivers/iio/proximity/sx_common.c:438:55: error: implicit declaration of function 'acpi_device_hid'; did you mean 'dmi_device_id'? [-Werror=implicit-function-declaration]
> 438 | snprintf(prop, ARRAY_SIZE(prop), "%s,reg_%s", acpi_device_hid(adev), reg_def->property);
> | ^~~~~~~~~~~~~~~
> | dmi_device_id
> drivers/iio/proximity/sx_common.c:438:44: error: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Werror=format=]
> 438 | snprintf(prop, ARRAY_SIZE(prop), "%s,reg_%s", acpi_device_hid(adev), reg_def->property);
> | ~^ ~~~~~~~~~~~~~~~~~~~~~
> | | |
> | char * int
> | %d
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 91af1d6c497b ("iio: proximity: sx_common: Add old register mapping")
>
> I have reverted that commit for today.
>
Thanks, I misdiagnosed the issue in previous attempt to fix this.
Problem is lack of stub for that function in !CONFIG_ACPI
(not as I thought a missing include - which was also the case).
As that will need an ACPI related header change to avoid ifdef nastiness
in the driver I'll drop the patch from my tree and we can get back
to this next cycle.
Thanks again,
Jonathan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-11 12:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-11 4:42 linux-next: build failure after merge of the iio tree Stephen Rothwell
2024-10-11 9:42 ` Jonathan Cameron
2024-10-11 12:09 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2024-10-08 4:41 Stephen Rothwell
2023-02-09 3:38 Stephen Rothwell
2023-02-09 10:20 ` Jonathan Cameron
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).