From nobody Sat Nov 30 16:35:58 2024 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85F1B1B29A3; Mon, 9 Sep 2024 09:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725875985; cv=none; b=sYwP7+c1Wy/O7dDnypgzZd0ORL/4Mc0MWFI0xfLCjGZ4a47ZcL29w1Qeutn3t398iREP3aRBxgHXhGPY4UtD3i68iH73e33qpjels4+f5DewbEJYt7VZRRgRFdCEJY7yCm2L8uGMY/l6XizoAm8rayLyE7Y4RZh41Dg2pOwwgE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725875985; c=relaxed/simple; bh=gLL8NoQ6DBWP80ccZZUoMaHmDnJFg+tgLibfVok5q7Y=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=g3ytsOnhEJw8O+k47Eh29rgqRwyjD/luXa/B0+I7r4fKJHmm2N140MYC9JRaCTlITuOS9nWdC1SvsLLqCcakLCWAq/iIMxS5Ml1aCdAtxTFE6LqPbU3r+zeCv48cL8txUF++2skVEi0XEVogkz015vnaSRGZwWF/kOrTSkr7EYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=TfFswYtU; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="TfFswYtU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1725875980; bh=Yj0ed46tsvdzgqrgty6WnxjpOflU7XY0odRrgln/Q0M=; h=Date:From:To:Cc:Subject:From; b=TfFswYtUC71gAOk6xpyLPIneelV8OQ8wOZJJzQMFP/XLfZng9V+FdELSeX7d1yDqu qxb1hdtzk6IMiu4Dv8B7/uA+DoKXEZ0D30VPeo86np+huYHaAZsJwu2Sb6UxqjgQS/ bMqzX9tqfiDTBo/GtD0RWrEmcFYkgUxVJbZ7beLXjACW22Je26SnK/GZNopOeolw6F eDSZ08lqtKSDDIpMnNwXv3zzZA4qA16xW6imwiDIYQdVwwHoOTqQNZhuzqNbdj1it+ JkAhM0pUriuhj9yenEoOLK9iHkjwoUFdTxebpJjMMiQtqdcRYYh0cC9BfiYWV1ho8x zHV70VhHf4Pqw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4X2Mkh09X1z4wcl; Mon, 9 Sep 2024 19:59:40 +1000 (AEST) Date: Mon, 9 Sep 2024 19:59:39 +1000 From: Stephen Rothwell To: Kees Cook , Lucas De Marchi , Thomas =?UTF-8?B?SGVsbHN0csO2bQ==?= Cc: Riana Tauro , Rodrigo Vivi , Michal Wajdeczko , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the kspp tree Message-ID: <20240909195939.067c1c13@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Ix6NSMvjqjGtk=XWkZda_/x"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/Ix6NSMvjqjGtk=XWkZda_/x Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, After merging the kspp tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down' 56 | static inline const char *str_up_down(bool v) | ^~~~~~~~~~~ In file included from include/linux/string_helpers.h:7, from drivers/gpu/drm/xe/xe_assert.h:9, from drivers/gpu/drm/xe/xe_force_wake.h:9, from drivers/gpu/drm/xe/xe_gt_idle.c:8: include/linux/string_choices.h:62:27: note: previous definition of 'str_up_= down' with type 'const char *(bool)' {aka 'const char *(_Bool)'} 62 | static inline const char *str_up_down(bool v) | ^~~~~~~~~~~ Caused by commit a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper") interacting with commit 0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info") from the drm-xe tree. I have applied the following patch for today. From: Stephen Rothwell Date: Mon, 9 Sep 2024 19:40:17 +1000 Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper" interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for powergating info" from the drm-xe tree. Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/xe/xe_gt_idle.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idl= e.c index 85a35ed153a3..0f98c1539c64 100644 --- a/drivers/gpu/drm/xe/xe_gt_idle.c +++ b/drivers/gpu/drm/xe/xe_gt_idle.c @@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc) return gt_to_xe(gt); } =20 -static inline const char *str_up_down(bool v) -{ - return v ? "up" : "down"; -} - static const char *gt_idle_state_to_string(enum xe_gt_idle_state state) { switch (state) { --=20 2.45.2 --=20 Cheers, Stephen Rothwell --Sig_/Ix6NSMvjqjGtk=XWkZda_/x Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmbexwsACgkQAVBC80lX 0GxNogf/fhjVLMYEVJncKhoKQTh+bbbygsbiNCT+zU1kAQ80Z7BXoCmS/A9ygNZ6 sHfIhwsZaUup9JLKEtE5zds3E7nFqrFzPO6sLo0Pfmvq7berzLjoP4nKcb960WGa czyefDKobG6B72m3XpSQt7sBghPWKphSIlzLa/Lbbw2jWXO19qbekbnteRttjNiR /FpfQz+BiQ4cTgjlw6p/Ay+grYQwaXA3MIiF4AObI22A+bcgMQYEJTQ1qySfESIv I53Ky2SRN1CzZStp7C+rN73zvpqyU2wDbx9KPduQZ3x7MdP3cE5i/jMZg16Pi1f0 5KANPJt2btORBrFlLs+2JNESRa353g== =PgpG -----END PGP SIGNATURE----- --Sig_/Ix6NSMvjqjGtk=XWkZda_/x--