linux-kernel - linux-next: build failure after merge of the iio tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241008154101.1c607649@canb.auug.org.au>
Date: Tue, 8 Oct 2024 15:41:01 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@...wei.com>
Cc: Al Viro <viro@...iv.linux.org.uk>, Abhash Jha
 <abhashkumarjha123@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the iio tree

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@...b.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@...b.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

Content of type "application/pgp-signature" skipped