From patchwork Wed May 24 03:54:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 98271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2579392vqo; Tue, 23 May 2023 21:02:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IvxyIxylzPYO7FpjoxmsR3Q9FKsEGLrWbaPpnixSOgfEmQG/CE6YqA1D+1/uWBLeRyU7u X-Received: by 2002:a17:90b:2292:b0:253:83d8:e487 with SMTP id kx18-20020a17090b229200b0025383d8e487mr14457869pjb.0.1684900942939; Tue, 23 May 2023 21:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684900942; cv=none; d=google.com; s=arc-20160816; b=YxA4wH1qFzdJdjAuvfIOVznjL20/JnG3zt5HRIMcLgzDAKSVds9Y2CrkBbr2shYhGl sWacOmxAuT+dF/KTJsh2acZ+DcJsUhypvFlIDMxGPEXzlTQbW+c7JUbgt6ABfzwEYp97 SVBPn6izAGc8QJ6sJi7+osTB36fk4H/RPppXwk53xw/nUyiE5b2+Ep28n9/XWS42qaz4 lULMzvgajDeC8pvsD8S9dizNjYUHHfnco2BvMYN59LcOkFT3Zxsy/dFQx+8UmuRdApOA 0zpd8KC3CiAXaAR+IkWtDOpF5raiA9+Vff3EphDyWsa6jLcMymSsTXOcX4dWlH288dro OaFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=ufTOQCYWmvctW2t/bzpFVthG9T5Pea4rH56eruBKQ00=; b=QNlAlExtQLoTfWyG2qkZOw31odYPt+3DzUq4lAFdkxRWwfiFlilRIhhBcS03aHsjaO CCe0gDbKcRT+/Y7efC7glzHQCgMMNFCLYv+bDoHpqNw8/v+J5Aod8bwBNgkyO51bKusx Nfi3ZGcXpJdjArz4UGxsS2PkpNIFdxrWtyeFWWFsdzpl0kvvGttVN6GGyOfHi0cm2bFq wlYXX/lXUxW9wAcZtR3DHhdk1di/aIfJ8nOIo8uvcwT0gMrdLXnc//F79v5Zp5G5iSEO EBVkO5vA5fXRPvSwF9ZrLCoQRoh8mf6VeaWBVkiv38aOha5vzrDxj9/ZSjdYu66/GyxB gc0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IcVxGVE5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z19-20020a63e113000000b00520dfb861fbsi445261pgh.416.2023.05.23.21.02.07; Tue, 23 May 2023 21:02:22 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IcVxGVE5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238905AbjEXDzF (ORCPT + 99 others); Tue, 23 May 2023 23:55:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239426AbjEXDyz (ORCPT ); Tue, 23 May 2023 23:54:55 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5775BA3; Tue, 23 May 2023 20:54:54 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QQy4T29Thz4wgv; Wed, 24 May 2023 13:54:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684900489; bh=ufTOQCYWmvctW2t/bzpFVthG9T5Pea4rH56eruBKQ00=; h=Date:From:To:Cc:Subject:From; b=IcVxGVE5CFjQAm1DQoE6IH1FWhQ3b6d9di7S9937VSk+qHFpWYrGVeXerri/1Jwal 6zi34qW55zo0HhKKAqBbCugNQJT3jq90ox407trt4f8LvbsEk3Ljm7JySvqhrL2AOt bFqLP+Bxx6lzRu0uYUC2Nb8BqHaASqx5IXCAxz1ILFOHD0ZYYhXHMtRqyM1MkXv0Rw vEENRkSYHHd0/uy84+5rikRH14RhvWWMMwW7nyNtGYZSApDItyVSVRhHYdtO1OkyVG mWrbfm+gApnk9q1CgY91wkqKJHCCBEEBCN5ZLkjLvgQy2edL4iQmRsP5xLsJ9cXo1t hZOcEct6zU7PQ== Date: Wed, 24 May 2023 13:54:48 +1000 From: Stephen Rothwell To: Takashi Iwai Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the sound tree Message-ID: <20230524135448.3ecad334@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766746691302824732?= X-GMAIL-MSGID: =?utf-8?q?1766746691302824732?= 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 --- 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) */