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 13:54:48 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Takashi Iwai <tiwai@suse.de>
Cc:     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 sound tree
Message-ID: <20230524135448.3ecad334@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/44FVtg0J.sp7ab2C_gAtk7/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/44FVtg0J.sp7ab2C_gAtk7/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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>
---
 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;
=20
 /* MIDI 1.0 Channel Pressure (32bit) */
--=20
2.39.2

--=20
Cheers,
Stephen Rothwell

--Sig_/44FVtg0J.sp7ab2C_gAtk7/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRtiogACgkQAVBC80lX
0GxkYwf/Zm8mQHXgVpOoGhCVzXRhonzQ6Cur4H/yDuP7dD2Ldc6ewsm2IrlDGQuD
GM4dyj8PUj260ffJZt/f/DrywKkowIcwm4ytDXmMRNzFOORTvdj/cMiSILT22dlO
6xTy5ZFHbW3NtiK8ew0dru3BauwQN2ahzTdCVJjjuXfvLK/rbGB+bZGx0CL0B1Q5
Ca82a5zSL/sBNt4yot1PCj9sECQUrZTrL4IPZYHUMy2tCMtAOMeotH8rW1kvMsbO
Z2O1LsWLRbHjMfFC6ojSGIbvLlHpbxe1+9U7CwlVf6zlHbaZuR22As4tpoveBIJI
LmEc4m3y5o7aPzJ6B5oRPsBq9eYyog==
=BQcw
-----END PGP SIGNATURE-----

--Sig_/44FVtg0J.sp7ab2C_gAtk7/--