From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: Abhash Jha <abhashkumarjha123@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the iio tree
Date: Fri, 11 Oct 2024 15:42:41 +1100 [thread overview]
Message-ID: <20241011154241.511878bd@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-10-11 4:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-11 4:42 Stephen Rothwell [this message]
2024-10-11 9:42 ` linux-next: build failure after merge of the iio tree Jonathan Cameron
2024-10-11 12:09 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2026-01-19 19:20 Mark Brown
2026-01-20 9:47 ` Jonathan Cameron
2024-10-08 4:41 Stephen Rothwell
2023-02-09 3:38 Stephen Rothwell
2023-02-09 10:20 ` Jonathan Cameron
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=20241011154241.511878bd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=abhashkumarjha123@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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