Anders Roxell 3698570389 scripts: kconfig: merge_config: config files: add a trailing newline ... [ Upstream commit 33330bcf031818e60a816db0cfd3add9eecc3b28 ] When merging files without trailing newlines at the end of the file, two config fragments end up at the same row if file1.config doens't have a trailing newline at the end of the file. file1.config "CONFIG_1=y" file2.config "CONFIG_2=y" ./scripts/kconfig/merge_config.sh -m .config file1.config file2.config This will generate a .config looking like this. cat .config ... CONFIG_1=yCONFIG_2=y" Making sure so we add a newline at the end of every config file that is passed into the script. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>		2024-09-18 19:23:03 +02:00
..
atomic	Fix up more non-executable files marked executable	2023-02-01 08:34:49 +01:00
basic
clang-tools	gen_compile_commands: fix invalid escape sequence warning	2024-03-26 18:20:25 -04:00
coccinelle
dtc	dt: dt-extract-compatibles: Don't follow symlinks when walking tree	2023-12-13 18:39:05 +01:00
dummy-tools
gcc-plugins	gcc-plugins: Rename last_stmt() for GCC 14+	2024-07-25 09:49:07 +02:00
gdb	scripts/gdb: fix SB_* constants parsing	2024-06-16 13:41:32 +02:00
genksyms
kconfig	scripts: kconfig: merge_config: config files: add a trailing newline	2024-09-18 19:23:03 +02:00
ksymoops
mod	modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS	2024-02-23 09:12:38 +01:00
package	kbuild: rpm-pkg: define _arch conditionally	2023-09-19 12:27:58 +02:00
selinux
tracing	ftrace/scripts: Update the instructions for ftrace-bisect.sh	2023-02-01 08:34:37 +01:00
.gitignore	scripts: add generate_rust_target.rs	2022-09-28 09:02:06 +02:00
adjust_autoksyms.sh
as-version.sh	kbuild: Update assembler calls to use proper flags and language target	2023-06-21 16:01:03 +02:00
asn1_compiler.c	ASN.1: Fix check for strdup() success	2023-04-26 14:28:44 +02:00
bin2c.c
bloat-o-meter
bootgraph.pl
bpf_doc.py	scripts/bpf_doc: Use silent mode when exec make cmd	2024-04-10 16:28:21 +02:00
cc-can-link.sh
cc-version.sh	Kbuild: add Rust support	2022-09-28 09:02:20 +02:00
check_extable.sh
check-local-export	kbuild: rewrite check-local-export in sh/awk	2022-09-29 04:40:15 +09:00
check-sysctl-docs
checkdeclares.pl
checkincludes.pl
checkkconfigsymbols.py	scripts: handle BrokenPipeError for python scripts	2023-03-17 08:50:31 +01:00
checkpatch.pl	locking: Introduce __cleanup() based infrastructure	2024-02-23 09:12:51 +01:00
checkstack.pl	checkstack: fix printed address	2023-12-13 18:39:19 +01:00
checksyscalls.sh
checkversion.pl	scripts: checkversion: modernize linux/version.h search strings	2021-08-05 20:55:39 +09:00
cleanfile
cleanpatch
coccicheck
config
const_structs.checkpatch
decode_stacktrace.sh	scripts/decode_stacktrace.sh: optionally use LLVM utilities	2024-01-20 11:50:11 +01:00
decodecode
depmod.sh
dev-needs.sh
diffconfig	scripts: handle BrokenPipeError for python scripts	2023-03-17 08:50:31 +01:00
documentation-file-ref-check
export_report.pl
extract_xc3028.pl
extract-ikconfig
extract-module-sig.pl
extract-sys-certs.pl
extract-vmlinux
faddr2line	scripts/faddr2line: Fix regression in name resolution on ppc64le	2022-11-16 10:42:10 +01:00
file-size.sh
find-unused-docs.sh
gcc-x86_32-has-stack-protector.sh	kbuild: Fix '-S -c' in x86 stack protector scripts	2024-08-03 08:49:39 +02:00
gcc-x86_64-has-stack-protector.sh	kbuild: Fix '-S -c' in x86 stack protector scripts	2024-08-03 08:49:39 +02:00
gen_autoksyms.sh
gen_ksymdeps.sh
gen-randstruct-seed.sh
generate_initcall_order.pl
generate_rust_analyzer.py	scripts: add generate_rust_analyzer.py	2022-09-28 09:02:06 +02:00
generate_rust_target.rs	x86: enable initial Rust support	2022-09-28 09:02:45 +02:00
get_abi.pl	scripts/get_abi: fix source path leak	2024-01-31 16:17:01 -08:00
get_dvb_firmware
get_feat.pl
get_maintainer.pl
gfp-translate	scripts: fix the gfp flags header path in gfp-translate	2023-06-28 11:12:22 +02:00
head-object-list.txt	arm64: remove special treatment for the link order of head.o	2023-02-25 11:25:42 +01:00
headerdep.pl
headers_install.sh
insert-sys-cert.c
install.sh
jobserver-exec
kallsyms.c	kallsyms: Reduce the memory occupied by kallsyms_seqs_of_names[]	2023-10-25 12:03:16 +02:00
Kbuild.include	kbuild: remove the target in signal traps when interrupted	2022-09-29 02:00:29 +09:00
Kconfig.include	kbuild: Update assembler calls to use proper flags and language target	2023-06-21 16:01:03 +02:00
kernel-doc
ld-version.sh	kbuild: Make ld-version.sh more robust against version string changes	2024-07-18 13:18:44 +02:00
leaking_addresses.pl
Lindent
link-vmlinux.sh	kbuild: fix short log for AS in link-vmlinux.sh	2024-07-11 12:47:18 +02:00
Makefile	Kbuild: add Rust support	2022-09-28 09:02:20 +02:00
Makefile.asm-generic
Makefile.build	kbuild: rust: avoid creating temporary files	2024-05-17 11:56:10 +02:00
Makefile.clang
Makefile.clean
Makefile.compiler	powerpc: remove checks for binutils older than 2.25	2024-01-25 15:27:18 -08:00
Makefile.debug	Kbuild: add Rust support	2022-09-28 09:02:20 +02:00
Makefile.dtbinst	kbuild: Install dtb files as 0644 in Makefile.dtbinst	2024-07-05 09:31:57 +02:00
Makefile.extrawarn	kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1	2024-04-03 15:19:34 +02:00
Makefile.gcc-plugins
Makefile.headersinst
Makefile.host	kbuild: rust: avoid creating temporary files	2024-05-17 11:56:10 +02:00
Makefile.kasan
Makefile.kcov
Makefile.kcsan
Makefile.kmsan	kmsan: add KMSAN runtime core	2022-10-03 14:03:19 -07:00
Makefile.lib	kbuild: avoid build error when single DTB is turned into composite DTB	2024-08-03 08:49:48 +02:00
Makefile.modfinal	btf, scripts: rust: drop is_rust_module.sh	2024-05-17 11:56:17 +02:00
Makefile.modinst	kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI	2023-02-09 11:28:11 +01:00
Makefile.modpost	modpost: propagate W=1 build option to modpost	2024-02-23 09:12:38 +01:00
Makefile.package	scripts: add rust in scripts/Makefile.package	2022-11-24 09:27:57 +09:00
Makefile.randstruct
Makefile.ubsan
Makefile.userprogs
Makefile.vmlinux	kbuild: rebuild .vmlinux.export.o when its prerequisite is updated	2022-10-03 03:52:58 +09:00
Makefile.vmlinux_o	kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o	2022-10-03 03:52:58 +09:00
makelst
markup_oops.pl
min-tool-version.sh	scripts/min-tool-version.sh: raise minimum clang version to 15.0.0 for s390	2022-11-09 18:41:16 +01:00
mkcompile_h	Revert "kbuild: Make scripts/compile.h when sh != bash"	2022-09-29 04:40:15 +09:00
mksysmap	kallsyms: ignore __kstrtab_* and __kstrtabns_* symbols	2022-10-03 03:51:58 +09:00
mkuboot.sh
module.lds.S
modules-check.sh
nsdeps
objdiff
objdump-func
pahole-flags.sh	bpf: Add --skip_encoding_btf_inconsistent_proto, --btf_gen_optimized to pahole flags for v1.25	2024-01-20 11:50:10 +01:00
pahole-version.sh
parse-maintainers.pl
patch-kernel
profile2linkerlist.pl
prune-kernel
recordmcount.c	recordmcount: Fix memory leaks in the uwrite function	2023-05-24 17:32:41 +01:00
recordmcount.h
recordmcount.pl
remove-stale-files
rust_is_available_bindgen_libclang.h	scripts: add rust_is_available.sh	2022-09-28 09:02:06 +02:00
rust_is_available.sh	rust: work around bindgen 0.69.0 issue	2024-08-29 17:30:32 +02:00
setlocalversion
show_delta
sign-file.c	sign-file: Fix incorrect return values check	2023-12-20 17:00:19 +01:00
sorttable.c
sorttable.h
spdxcheck-test.sh
spdxcheck.py
spdxexclude
spelling.txt
sphinx-pre-install
split-man.pl
stackdelta
stackusage
subarch.include	LoongArch: Add build infrastructure	2022-06-03 20:09:27 +08:00
syscallhdr.sh
syscallnr.sh
syscalltbl.sh
tags.sh	scripts/tags.sh: Resolve gtags empty index generation	2023-07-05 18:27:38 +01:00
test_fortify.sh
tools-support-relr.sh
unifdef.c
ver_linux
xen-hypercalls.sh
xz_wrap.sh