From: Nathan Chancellor <nathan@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: Nicolas Schier <nsc@kernel•org>,
KBuild Mailing List <linux-kbuild@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the kbuild tree with the clang-fixes tree
Date: Tue, 2 Jun 2026 18:16:29 -0700 [thread overview]
Message-ID: <20260603011629.GA1940387@ax162> (raw)
In-Reply-To: <ah7geBSoDn696L9S@sirena.org.uk>
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
prev parent reply other threads:[~2026-06-03 1:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 13:54 linux-next: manual merge of the kbuild tree with the clang-fixes tree Mark Brown
2026-06-03 1:16 ` Nathan Chancellor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260603011629.GA1940387@ax162 \
--to=nathan@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kbuild@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nsc@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox