* linux-next: manual merge of the kbuild tree with the clang-fixes tree
@ 2026-06-02 13:54 Mark Brown
2026-06-03 1:16 ` Nathan Chancellor
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-06-02 13:54 UTC (permalink / raw)
To: Nathan Chancellor, Nicolas Schier, KBuild Mailing List
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]
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))
+#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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the kbuild tree with the clang-fixes tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Chancellor @ 2026-06-03 1:16 UTC (permalink / raw)
To: Mark Brown
Cc: Nicolas Schier, KBuild Mailing List, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-03 1:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox