From mboxrd@z Thu Jan 1 00:00:00 1970 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 5173A2B9A4; Wed, 3 Jun 2026 01:16:33 +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=1780449395; cv=none; b=tRa2cOhyurvRRR6sxq7MGxT7XyLgKpkioQonqbUSNFa/A9nub/RHsJCBMsT2bXAYhTKFNS1hebQnK3Kbf5fqZ7gIELxJp155/gIt3SaXZEPw+Ye/qLKHjpJbkwDg8W1uzXIPOcinh3Zukf1p5Dsxqm0WH8zfPkkjF8mgoI8T1ZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780449395; c=relaxed/simple; bh=aSxhV7Dzuxt+88a2tyUyNJwTZ/2Z2mfgZ9AhdPFwnAg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ssFMl8m0785Oc+Y294/KD7Udv9GYFgLcFWdpg07oX47byOKKE1sVXxGM9F8yAFfgnUtT6ZE6Wjgl8HPXVhjSqysr+xZbY39Z7c4e83pWKvpJ9UDxaCxhMcSvOZqn2WykCvu+Q0KyvW51OvcZTB8PFHGZewsJnWaci88uHSc6fPo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YuJa5eYa; 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="YuJa5eYa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5272D1F00893; Wed, 3 Jun 2026 01:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780449393; bh=0fBTevK6gNCF+y1Qpad9tw8VN5c/evrMNB7AyYy+84U=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=YuJa5eYan0ZRGi8oX/AjTIbHCBHT/Ab4ivKUR1dGtqh+w5Iy7fwxqMBm9qeKbgS3l S+bjWNgN/1rVyijVXS/p1B0ca+/H05ffed0UBnCw7LKt1vAtdUnTbWIo4OQ9OL7CRD dqhFRBD0dEzSgbkK11hU2HeV/VxwTKv9JX7ihC1rhS6UdVYRColXC7TQ82YqWLmvAg rzXhbHBuveKfmU9l8fRbEE9wldOn2+GxvLg8EtXAxEaYcCDOlxq4weQWzulUH50t45 hWaE2YdgG4oc7Dlj5e7J5FmoHcpttn4uoQxSd3kTYaG8a34b7qqXSNL5J/RUG8BHl+ cdEOmgC6zhWBw== Date: Tue, 2 Jun 2026 18:16:29 -0700 From: Nathan Chancellor To: Mark Brown Cc: Nicolas Schier , KBuild Mailing List , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kbuild tree with the clang-fixes tree Message-ID: <20260603011629.GA1940387@ax162> References: Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Jun 02, 2026 at 02:54:00PM +0100, Mark Brown wrote: > 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: Technically now Linus's tree after he merged clang-fixes in 77590cacabb3 ("Merge tag 'clang-fixes-7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux") > 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)) > > +#if CONFIG_CLANG_VERSION >= 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) > > #define __diag_ignore_all(option, comment) \ > - __diag_clang(13, ignore, option) > + __diag_clang(all, ignore, option) > > /* > * clang has horrible behavior with "g" or "rm" constraints for asm Thanks a lot, looks good to me and noted for my 7.2 Kbuild pull request. -- Cheers, Nathan