Commit 3f44ae97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.11-2' of... 

Merge tag 'kbuild-fixes-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Eliminate the fdtoverlay command duplication in scripts/Makefile.lib

 - Fix 'make compile_commands.json' for external modules

 - Ensure scripts/kconfig/merge_config.sh handles missing newlines

 - Fix some build errors on macOS

* tag 'kbuild-fixes-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: fix typos "prequisites" to "prerequisites"
  Documentation/llvm: turn make command for ccache into code block
  kbuild: avoid scripts/kallsyms parsing /dev/null
  treewide: remove unnecessary <linux/version.h> inclusion
  scripts: kconfig: merge_config: config files: add a trailing newline
  Makefile: add $(srctree) to dependency of compile_commands.json target
  kbuild: clean up code duplication in cmd_fdtoverlay
parents 872cf28b 8fb4ac1c

Documentation/kbuild/llvm.rst

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ Ccache 


``ccache`` can be used with ``clang`` to improve subsequent builds, (though

KBUILD_BUILD_TIMESTAMP_ should be set to a deterministic value between builds

in order to avoid 100% cache misses, see Reproducible_builds_ for more info):

in order to avoid 100% cache misses, see Reproducible_builds_ for more info)::



	KBUILD_BUILD_TIMESTAMP='' make LLVM=1 CC="ccache clang"

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ nsdeps: modules 
quiet_cmd_gen_compile_commands = GEN     $@

      cmd_gen_compile_commands = $(PYTHON3) $< -a $(AR) -o $@ $(filter-out $<, $(real-prereqs))



$(extmod_prefix)compile_commands.json: scripts/clang-tools/gen_compile_commands.py \

$(extmod_prefix)compile_commands.json: $(srctree)/scripts/clang-tools/gen_compile_commands.py \

	$(if $(KBUILD_EXTMOD),, vmlinux.a $(KBUILD_VMLINUX_LIBS)) \

	$(if $(CONFIG_MODULES), $(MODORDER)) FORCE

	$(call if_changed,gen_compile_commands)

drivers/accessibility/speakup/genmap.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <stdio.h>

#include <libgen.h>

#include <string.h>

#include <linux/version.h>

#include <ctype.h>

#include "utils.h"

drivers/accessibility/speakup/makemapdata.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <stdio.h>

#include <libgen.h>

#include <string.h>

#include <linux/version.h>

#include <ctype.h>

#include "utils.h"

drivers/staging/media/atomisp/include/linux/atomisp.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define _ATOM_ISP_H



#include <linux/types.h>

#include <linux/version.h>



/* struct media_device_info.hw_revision */

#define ATOMISP_HW_REVISION_MASK	0x0000ff00