linux-kernel - linux-next: build failure after merge of the mmc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241008143159.35e26d8e@canb.auug.org.au>
Date: Tue, 8 Oct 2024 14:31:59 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ulf Hansson <ulf.hansson@...aro.org>
Cc: Al Viro <viro@...iv.linux.org.uk>, Avri Altman <avri.altman@....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 mmc tree

Hi all,

After merging the mmc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/mmc/core/block.c:53:10: fatal error: asm/unaligned.h: No such file or directory
   53 | #include <asm/unaligned.h>
      |          ^~~~~~~~~~~~~~~~~

Caused by commit

  251377c52fde ("mmc: core: Adjust ACMD22 to SDUC")

interatcing with commit

  5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")

from Linus' tree (in v6.12-rc2).

I applied the following merge fix patch.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 8 Oct 2024 14:25:34 +1100
Subject: [PATCH] fix up for "mmc: core: Adjust ACMD22 to SDUC"

interacting with "move asm/unaligned.h to linux/unaligned.h" from
Linus' tree.

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

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 66de5ccbb432..9752ecac6c5b 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -50,7 +50,7 @@
 #include <linux/mmc/sd.h>
 
 #include <linux/uaccess.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
 
 #include "queue.h"
 #include "block.h"
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell


Content of type "application/pgp-signature" skipped