Re: linux-next: build failure after merge of the mmc tree

[Ulf Hansson]

On Tue, 8 Oct 2024 at 05:32, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> ---
>  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
>

Stephen, thanks for reporting!

Avri, no action needed. I will rebase my tree on Monday on the latest
rc and amend the offending patch according to Stephen's change.

Kind regards
Uffe