From nobody Mon Jun 8 04:19:37 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0F7963E5EF7; Tue, 2 Jun 2026 13:54:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780408445; cv=none; b=tIrQpykdcMDwsr8S2Nddq6RKKeDls3DU6l/hyxEyZtbb35pzsUhUUhqm+QU4Mu3OY1s4tGj6JGHDbSAg00IWHpa+Ft2QseFcHj331kezpovJjCaYdysEeHzFLXk6WNceOh2+7WtfJq4pOefGvtLvgpWsF06pQtD1a+xx/SvgsY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780408445; c=relaxed/simple; bh=ztm0S2apfXR2YPeL2Ivnd2WA2af3lKVBz9tI+thwSCk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=RAqRJXbojskQAyoNvaPAIha6l5bb3GJeX/0D/veKuMWxXIjUXzLvNRTABvYSMpY1rKQELRQ6Q3Oop/53ZRSKy5tBOlYhq+3O7xBaLg1mlEuLDK8+Q2uenYWSLkpgCp+7vpt6do+F03UkmmOVF1d047UScPH0CF5TEUyACl69btc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bhg8pFb1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bhg8pFb1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81D2A1F00893; Tue, 2 Jun 2026 13:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780408444; bh=dshr4JV7io60F2peG9AKsFQL3XOYnBCiIcd5ZS94RT8=; h=Date:From:To:Cc:Subject; b=bhg8pFb1ZnjvC/Sl0+35ppYp0qtBLQ0A65y+fW56ISoEkdVs2FMnwGcg8PisbR0Ii olx0Y1k2PlNIcMkzSm4sahNddCynBzTq4xS3mfGgcJlw/V0VaNVLBcpwiYpw27pSJq i3IUNPC/RkzP0CHNPv0SHJqWdU3zREXUxI1YdlecaKNjZpExNcN7neM6i+I1loCJtv 4U8Z/Lxs5aiujaBHZ2/Kmx1lboLA2zo+49gwIqto+FZRsXanjuEvqX848NbzmUiGYi rLSC6ur8ZulPjomZjWTJOMEC2keIU94HRGAO72Z885EjvwtrwCIf8sDzfba+chK1sm H4x8b5IBo53fg== Date: Tue, 2 Jun 2026 14:54:00 +0100 From: Mark Brown To: Nathan Chancellor , Nicolas Schier , KBuild Mailing List Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the kbuild tree with the clang-fixes tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3saV1wf8TKnbYn2i" Content-Disposition: inline --3saV1wf8TKnbYn2i Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the kbuild tree got a conflict in: include/linux/compiler-clang.h between commit: 175db11786bde ("Disable -Wattribute-alias for clang-23 and newer") from the clang-fixes tree and commit: c919893eabb43 ("compiler-clang.h: Drop explicit version number from "all"= diagnostic macro") from the kbuild tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc include/linux/compiler-clang.h index 527e4e1360205,a105e2e8016c2..0000000000000 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@@ -131,16 -122,10 +122,16 @@@ #define __diag_str(s) __diag_str1(s) #define __diag(s) _Pragma(__diag_str(clang diagnostic s)) =20 +#if CONFIG_CLANG_VERSION >=3D 230000 +#define __diag_clang_23(s) __diag(s) +#else +#define __diag_clang_23(s) +#endif + - #define __diag_clang_13(s) __diag(s) + #define __diag_clang_all(s) __diag(s) =20 #define __diag_ignore_all(option, comment) \ - __diag_clang(13, ignore, option) + __diag_clang(all, ignore, option) =20 /* * clang has horrible behavior with "g" or "rm" constraints for asm --3saV1wf8TKnbYn2i Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmoe4HgACgkQJNaLcl1U h9BWfwf+P759imWCAS0o2xv3zxktcAJjoMPhiuE+PAALHWXIEZBPFD45w+FwzoEc wF+JKHQYAYo6nn6CRELeGWur6I24MOuMlH8H9zWcDVkBv4NxbcbhYtL2ancMmEzN cWYqjP9xHWuEkNp9CK/LTrpM1ututyq2GeXT9T5z7O6KOQ/byz4mNu+Mv/rVX2J4 qUe0ZUJdYL7v9cltsTlAVLDVsFGZsnl7xy8PfH9Q2rKLXwp5a84oB82i62IL37XF 6q4jf7rS2y5wjPNYLNgpRGNoUHq6Vv1xWDSuIxJCQsZWhjlNtfy4D90Grx6y01Yr QIdCXleOoNseFq3QJHH4WcqKmQl6CA== =Yb79 -----END PGP SIGNATURE----- --3saV1wf8TKnbYn2i--