Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 24 May 2023 09:14:34 +0200
Message-ID: <87353mfbfp.wl-tiwai@suse.de>
From:   Takashi Iwai <tiwai@suse.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Takashi Iwai <tiwai@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the sound tree
In-Reply-To: <20230524135448.3ecad334@canb.auug.org.au>
References: <20230524135448.3ecad334@canb.auug.org.au>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0
MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue")
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

On Wed, 24 May 2023 05:54:48 +0200,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> After merging the sound tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from sound/core/seq/seq_ump_convert.c:11:
> include/sound/ump_msg.h:196:13: error: duplicate member 'reserved'
>   196 |         u32 reserved:8;
>       |             ^~~~~~~~
> include/sound/ump_msg.h:197:13: error: duplicate member 'program'
>   197 |         u32 program:8;
>       |             ^~~~~~~
> include/sound/ump_msg.h:198:13: error: duplicate member 'channel'
>   198 |         u32 channel:4;
>       |             ^~~~~~~
> include/sound/ump_msg.h:199:13: error: duplicate member 'status'
>   199 |         u32 status:4;
>       |             ^~~~~~
> include/sound/ump_msg.h:200:13: error: duplicate member 'group'
>   200 |         u32 group:4;
>       |             ^~~~~
> include/sound/ump_msg.h:201:13: error: duplicate member 'type'
>   201 |         u32 type:4;
>       |             ^~~~
> 
> Caused by commit
> 
>   0b5288f5fe63 ("ALSA: ump: Add legacy raw MIDI support")
> 
> I have applied the following fix patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 24 May 2023 13:39:38 +1000
> Subject: [PATCH] fix up for "ALSA: ump: Add legacy raw MIDI support"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks!  This was a late change and I have skipped testing big-endian
since then, as it seems...

I queued up your fix patch.


Takashi

> ---
>  include/sound/ump_msg.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/sound/ump_msg.h b/include/sound/ump_msg.h
> index c76c39944a5f..a594ef951b54 100644
> --- a/include/sound/ump_msg.h
> +++ b/include/sound/ump_msg.h
> @@ -192,13 +192,13 @@ struct snd_ump_midi1_msg_program {
>  	u32 program:8;
>  	u32 reserved:8;
>  #else
> -#endif
>  	u32 reserved:8;
>  	u32 program:8;
>  	u32 channel:4;
>  	u32 status:4;
>  	u32 group:4;
>  	u32 type:4;
> +#endif
>  } __packed;
>  
>  /* MIDI 1.0 Channel Pressure (32bit) */
> -- 
> 2.39.2
> 
> -- 
> Cheers,
> Stephen Rothwell