From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro•org>
Cc: Al Viro <viro@zeniv•linux.org.uk>,
Avri Altman <avri.altman@wdc•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 mmc tree
Date: Tue, 8 Oct 2024 14:31:59 +1100 [thread overview]
Message-ID: <20241008143159.35e26d8e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
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@canb•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@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-08 3:32 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-08 3:31 Stephen Rothwell [this message]
2024-10-08 15:26 ` linux-next: build failure after merge of the mmc tree Ulf Hansson
2024-10-10 6:34 ` Avri Altman
-- strict thread matches above, loose matches on Subject: below --
2026-02-05 13:33 Mark Brown
2026-02-05 20:11 ` Josua Mayer
2026-02-05 20:28 ` Josua Mayer
2026-02-05 20:52 ` Mark Brown
2025-05-21 5:42 Stephen Rothwell
2025-05-21 6:05 ` Binbin Zhou
2024-06-21 15:11 Mark Brown
2023-06-09 1:34 Stephen Rothwell
2023-06-09 6:10 ` Wenbin Mei (梅文彬)
2023-05-10 1:18 Stephen Rothwell
2023-05-10 2:26 ` Jakub Kicinski
2023-05-11 10:54 ` Ulf Hansson
2021-04-16 3:48 Stephen Rothwell
2021-04-16 3:49 ` Stephen Rothwell
2021-04-26 1:31 ` Stephen Rothwell
2021-04-26 9:46 ` Ulf Hansson
2020-10-06 5:29 Stephen Rothwell
2020-09-25 4:40 Stephen Rothwell
2020-06-02 3:44 Stephen Rothwell
2020-06-02 12:05 ` Ulf Hansson
2020-06-02 12:15 ` Kalle Valo
2020-05-18 4:27 Stephen Rothwell
2020-05-18 6:10 ` Martin Blumenstingl
2018-02-15 0:49 Stephen Rothwell
2018-02-15 5:29 ` Kishon Vijay Abraham I
2014-05-30 3:23 Stephen Rothwell
2014-06-02 9:31 ` Ulf Hansson
[not found] ` <20140602214039.10062.15077@quantum>
2014-06-02 21:43 ` Chris Ball
2014-05-26 4:07 Stephen Rothwell
2014-06-02 5:11 ` Stephen Rothwell
2014-06-03 22:52 ` Stephen Rothwell
2014-06-04 19:21 ` Chris Ball
2014-06-05 2:57 ` Chris Ball
2014-05-23 5:32 Stephen Rothwell
2014-05-23 8:45 ` Sebastian Hesselbarth
2014-04-22 3:06 Stephen Rothwell
2014-04-22 4:57 ` Seungwon Jeon
2014-04-22 8:40 ` Ulf Hansson
2014-04-22 11:10 ` Chris Ball
2013-12-13 1:57 Stephen Rothwell
2013-12-17 2:28 ` Stephen Rothwell
2013-12-17 3:07 ` Dong Aisheng
2013-12-17 3:16 ` Shawn Guo
2013-12-17 8:06 ` Dong Aisheng
2014-01-06 6:22 ` Stephen Rothwell
2014-01-06 6:30 ` Dong Aisheng
2014-01-06 6:46 ` Shawn Guo
2014-01-06 6:46 ` Dong Aisheng
2014-01-06 6:30 ` Shawn Guo
2014-01-06 6:44 ` Shawn Guo
2014-01-06 7:29 ` Stephen Rothwell
2014-01-07 3:27 ` Stephen Rothwell
2014-01-13 17:49 ` Chris Ball
2013-12-23 1:40 ` Stephen Rothwell
2011-11-09 1:06 Stephen Rothwell
2011-11-09 1:35 ` Chris Ball
2011-09-22 6:13 Stephen Rothwell
2011-09-22 11:56 ` Chris Ball
2011-07-16 9:30 Stephen Rothwell
2011-07-18 22:29 ` Per Forlin
2011-03-28 2:10 Stephen Rothwell
2010-10-25 1:12 Stephen Rothwell
2010-10-25 2:21 ` Chris Ball
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=20241008143159.35e26d8e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avri.altman@wdc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ulf.hansson@linaro$(echo .)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