From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79B60C77B7A for ; Wed, 24 May 2023 07:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239945AbjEXHQT (ORCPT ); Wed, 24 May 2023 03:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240283AbjEXHPm (ORCPT ); Wed, 24 May 2023 03:15:42 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03F4610D0; Wed, 24 May 2023 00:14:36 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E568E1F8AF; Wed, 24 May 2023 07:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1684912474; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9kSKZu1XbpZDKX9dfP2mGYle5KVVElwyZwMlqtknGE8=; b=vQLcuzAnG7vI/74domn+u5K2iYjcuQd23YeyD3vsii5tb4uMBnIrIpeOiChq14EmF64e85 yzWHlA+3I4Zh+7Wou5E6YhcEVa1fgA0YWAst1f2QElAzUmvFVdQoO4uVUYrKX/2iLN5PNU oBvQ6c2oX3AEf2oMK5ConbS/q74cIbc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1684912474; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9kSKZu1XbpZDKX9dfP2mGYle5KVVElwyZwMlqtknGE8=; b=o81q43jjugn/Tk38op5Oxr+BwcKYBj38l5OtmU8/mcGXJzDmQCUmeWxShPfZH8a8cjSINx BNJZz7nv2eqMGuBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C60A013425; Wed, 24 May 2023 07:14:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id t6CGL1q5bWQoOAAAMHmgww (envelope-from ); Wed, 24 May 2023 07:14:34 +0000 Date: Wed, 24 May 2023 09:14:34 +0200 Message-ID: <87353mfbfp.wl-tiwai@suse.de> From: Takashi Iwai To: Stephen Rothwell Cc: Takashi Iwai , Linux Kernel Mailing List , Linux Next Mailing List 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > 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 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