diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-21 10:56:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-21 10:56:37 -0800 |
| commit | 83cd5fd014c0abfd3cf6d8e4189333d099630845 (patch) | |
| tree | 7c1b49df8318674bd5da15eda2e7fbe26e7a9aeb /init | |
| parent | f3bbac32475b27f49be201f896d98d4009de1562 (diff) | |
| parent | 13e1df09284da53ae5abdd3364c36caf8f0f8916 (diff) | |
| download | lwn-83cd5fd014c0abfd3cf6d8e4189333d099630845.tar.gz lwn-83cd5fd014c0abfd3cf6d8e4189333d099630845.zip | |
Merge tag 'kbuild-fixes-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Hide LDFLAGS_vmlinux from decompressor Makefiles to fix error
messages when GNU Make 4.4 is used.
- Fix 'make modules' build error when CONFIG_DEBUG_INFO_BTF_MODULES=y.
- Fix warnings emitted by GNU Make 4.4 in scripts/kconfig/Makefile.
- Support GNU Make 4.4 for scripts/jobserver-exec.
- Show clearer error message when kernel/gen_kheaders.sh fails due to
missing cpio.
* tag 'kbuild-fixes-v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kheaders: explicitly validate existence of cpio command
scripts: support GNU make 4.4 in jobserver-exec
kconfig: Update all declared targets
scripts: rpm: make clear that mkspec script contains 4.13 feature
init/Kconfig: fix LOCALVERSION_AUTO help text
kbuild: fix 'make modules' error when CONFIG_DEBUG_INFO_BTF_MODULES=y
kbuild: export top-level LDFLAGS_vmlinux only to scripts/Makefile.vmlinux
init/version-timestamp.c: remove unneeded #include <linux/version.h>
docs: kbuild: remove mention to dropped $(objtree) feature
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 | ||||
| -rw-r--r-- | init/version-timestamp.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7ceabd320425..44e90b28a30f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -204,7 +204,7 @@ config LOCALVERSION_AUTO appended after any matching localversion* files, and after the value set in CONFIG_LOCALVERSION. - (The actual string used here is the first eight characters produced + (The actual string used here is the first 12 characters produced by running the command: $ git rev-parse --verify HEAD diff --git a/init/version-timestamp.c b/init/version-timestamp.c index 179e93bae539..043cbf80a766 100644 --- a/init/version-timestamp.c +++ b/init/version-timestamp.c @@ -2,7 +2,6 @@ #include <generated/compile.h> #include <generated/utsrelease.h> -#include <linux/version.h> #include <linux/proc_ns.h> #include <linux/refcount.h> #include <linux/uts.h> |