Re: linux-next: manual merge of the kapi tree with the kbuild tree

[Nathan Chancellor <nathan@kernel.org>]

On Sat, Oct 10, 2026 at 01:45:50AM +0200, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the kapi tree got a conflict in:
> 
>   Makefile
> 
> between commit:
> 
>   26d665bef44fa ("kbuild: add header check facility as a manually run static analyzer")
> 
> from the kbuild tree and commit:
> 
>   6d009bd85fa4e ("kernel/api: enable kerneldoc-based API specifications")
> 
> from the kapi 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 Makefile
> index 11061c73f93e7,fd7917f78fa45..0000000000000
> --- a/Makefile
> +++ b/Makefile
> @@@ -2262,7 -2251,7 +2262,8 @@@ clean: $(clean-dirs
>   		-o -name '*.ll' \
>   		-o -name '*.gcno' \
>   		-o -name '*.long-type-*.txt' \
>  +		-o -name '*.header-check' \
> + 		-o -name '*.apispec.h' \
>   		\) -type f -print \
>   		-o -name '.tmp_*' -print \
>   		| xargs rm -rf

Looks good to me, thanks!

-- 
Cheers,
Nathan