From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: Al Viro <viro@zeniv•linux.org.uk>,
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: Tue, 8 Oct 2024 15:41:01 +1100 [thread overview]
Message-ID: <20241008154101.1c607649@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-10-08 4:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-08 4:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-19 19:20 linux-next: build failure after merge of the iio tree Mark Brown
2026-01-20 9:47 ` Jonathan Cameron
2024-10-11 4:42 Stephen Rothwell
2024-10-11 9:42 ` Jonathan Cameron
2024-10-11 12:09 ` Greg KH
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=20241008154101.1c607649@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 \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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