linux-kernelorg-stable/scripts
Anders Roxell 86a1aaee7f scripts: kconfig: merge_config: config files: add a trailing newline
[ Upstream commit 33330bcf03 ]

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:24:05 +02:00
..
atomic locking/atomic: scripts: fix ${atomic}_sub_and_test() kerneldoc 2024-06-27 13:49:11 +02:00
basic
clang-tools gen_compile_commands: fix invalid escape sequence warning 2024-03-26 18:19:11 -04:00
coccinelle Revert "debugfs, coccinelle: check for obsolete DEFINE_SIMPLE_ATTRIBUTE() usage" 2023-07-29 11:05:31 -04:00
dtc dt: dt-extract-compatibles: Don't follow symlinks when walking tree 2023-12-13 18:45:03 +01:00
dummy-tools kbuild: dummy-tools: make MPROFILE_KERNEL checks work on BE 2023-09-01 16:38:04 +09:00
gcc-plugins gcc-plugins/stackleak: Avoid .head.text section 2024-04-13 13:07:40 +02:00
gdb scripts/gdb: fix lx-device-list-bus and lx-device-list-class 2023-12-13 18:45:19 +01:00
genksyms
kconfig scripts: kconfig: merge_config: config files: add a trailing newline 2024-09-18 19:24:05 +02:00
ksymoops
mod modpost: do not warn about missing MODULE_DESCRIPTION() for vmlinux.o 2024-06-21 14:38:32 +02:00
package kbuild: remove stale code for 'source' symlink in packaging scripts 2023-10-01 23:06:06 +09:00
selinux
tracing
.gitignore rust: support running Rust documentation tests as KUnit ones 2023-07-19 09:32:53 -06:00
Kbuild.include
Kconfig.include x86/kconfig: Add as-instr64 macro to properly evaluate AS_WRUSS 2024-08-03 08:53:21 +02:00
Lindent
Makefile rust: support running Rust documentation tests as KUnit ones 2023-07-19 09:32:53 -06:00
Makefile.asm-generic
Makefile.build kbuild: rust: force `alloc` extern to allow "empty" Rust files 2024-05-02 16:32:42 +02:00
Makefile.clang
Makefile.clean
Makefile.compiler kbuild: Add -Wa,--fatal-warnings to as-instr invocation 2024-03-06 14:48:41 +00:00
Makefile.debug
Makefile.defconf
Makefile.dtbinst kbuild: Install dtb files as 0644 in Makefile.dtbinst 2024-07-05 09:34:02 +02:00
Makefile.extrawarn kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1 2024-04-03 15:28:29 +02:00
Makefile.gcc-plugins
Makefile.headersinst
Makefile.host kbuild: rust: avoid creating temporary files 2023-07-24 03:15:31 +09:00
Makefile.kasan
Makefile.kcov
Makefile.kcsan
Makefile.kmsan
Makefile.lib kbuild: avoid build error when single DTB is turned into composite DTB 2024-08-03 08:54:36 +02:00
Makefile.modfinal kbuild: Disable KCSAN for autogenerated *.mod.c intermediaries 2024-05-17 12:02:12 +02:00
Makefile.modinst kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules 2023-09-25 16:01:05 +09:00
Makefile.modpost linux/export.h: make <linux/export.h> independent of CONFIG_MODULES 2023-07-25 00:59:32 +09:00
Makefile.package kbuild: Fix build target deb-pkg: ln: failed to create hard link 2024-07-05 09:33:56 +02:00
Makefile.randstruct
Makefile.ubsan
Makefile.userprogs
Makefile.vdsoinst s390/vdso: Create .build-id links for unstripped vdso files 2024-06-12 11:12:33 +02:00
Makefile.vmlinux x86/retpoline: Make sure there are no unconverted return thunks due to KCSAN 2023-11-28 17:19:36 +00:00
Makefile.vmlinux_o x86/srso: Fix unret validation dependencies 2023-11-20 11:58:52 +01:00
as-version.sh
asn1_compiler.c
bloat-o-meter scripts/bloat-o-meter: count weak symbol sizes 2023-08-21 13:46:25 -07:00
bootgraph.pl
bpf_doc.py scripts/bpf_doc: Use silent mode when exec make cmd 2024-04-10 16:35:40 +02:00
cc-can-link.sh
cc-version.sh
check-git
check-sysctl-docs
check_extable.sh
checkdeclares.pl
checkincludes.pl
checkkconfigsymbols.py
checkpatch.pl - An extensive rework of kexec and crash Kconfig from Eric DeVolder 2023-08-29 14:53:51 -07:00
checkstack.pl scripts/checkstack.pl: match all stack sizes for s390 2023-12-20 17:01:59 +01:00
checksyscalls.sh
checkversion.pl
cleanfile
cleanpatch
coccicheck
config
const_structs.checkpatch
decode_stacktrace.sh scripts/decode_stacktrace.sh: optionally use LLVM utilities 2024-01-20 11:51:49 +01:00
decodecode
depmod.sh kbuild: move depmod rule to scripts/Makefile.modinst 2023-08-29 22:38:23 +09:00
dev-needs.sh
diffconfig
documentation-file-ref-check
export_report.pl
extract-ikconfig
extract-module-sig.pl
extract-sys-certs.pl
extract-vmlinux
extract_xc3028.pl
faddr2line
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:54:24 +02:00
gcc-x86_64-has-stack-protector.sh kbuild: Fix '-S -c' in x86 stack protector scripts 2024-08-03 08:54:24 +02:00
gen-randstruct-seed.sh
generate_initcall_order.pl
generate_rust_analyzer.py scripts: generate_rust_analyzer: provide `cfg`s for `core` and `alloc` 2023-08-20 22:54:32 +02:00
generate_rust_target.rs
get_abi.pl scripts/get_abi: fix source path leak 2024-01-31 16:18:55 -08:00
get_dvb_firmware
get_feat.pl
get_maintainer.pl
gfp-translate
head-object-list.txt
headerdep.pl
headers_install.sh x86: Remove the arch_calc_vm_prot_bits() macro from the UAPI 2023-09-06 23:50:46 +02:00
insert-sys-cert.c
install.sh
jobserver-exec
kallsyms.c scripts/kallsyms: Fix build failure by setting errno before calling getline() 2023-07-29 15:57:32 +09:00
kernel-doc scripts: kernel-doc: fix macro handling in enums 2023-08-18 11:14:08 -06:00
ld-version.sh kbuild: Make ld-version.sh more robust against version string changes 2024-07-18 13:21:27 +02:00
leaking_addresses.pl
link-vmlinux.sh kbuild: fix short log for AS in link-vmlinux.sh 2024-07-11 12:49:21 +02:00
makelst
markup_oops.pl
min-tool-version.sh rust: upgrade to Rust 1.73.0 2024-02-16 19:10:43 +01:00
misc-check
mkcompile_h
mksysmap kallsyms: ignore ARMv4 thunks along with others 2024-02-23 09:24:59 +01:00
mkuboot.sh
module.lds.S modules: Drop the .export_symbol section from the final modules 2024-06-12 11:12:12 +02:00
modules-check.sh
nsdeps
objdiff
objdump-func
orc_hash.sh
pahole-flags.sh
pahole-version.sh
parse-maintainers.pl
patch-kernel
profile2linkerlist.pl
prune-kernel
recordmcount.c
recordmcount.h
recordmcount.pl
relocs_check.sh
remove-stale-files kbuild: rpm-pkg: rename binkernel.spec to kernel.spec 2023-07-25 00:59:33 +09:00
rust_is_available.sh rust: work around `bindgen` 0.69.0 issue 2024-08-29 17:33:29 +02:00
rust_is_available_bindgen_libclang.h
rust_is_available_test.py kbuild: rust_is_available: add test suite 2023-08-10 01:18:34 +02:00
rustdoc_test_builder.rs rust: support running Rust documentation tests as KUnit ones 2023-07-19 09:32:53 -06:00
rustdoc_test_gen.rs rust: support running Rust documentation tests as KUnit ones 2023-07-19 09:32:53 -06:00
setlocalversion scripts/setlocalversion: also consider annotated tags of the form vx.y.z-${file_localversion} 2023-08-08 01:08:54 +09:00
show_delta
sign-file.c sign-file: Fix incorrect return values check 2023-12-20 17:01:49 +01:00
sorttable.c
sorttable.h
spdxcheck-test.sh
spdxcheck.py
spdxexclude
spelling.txt scripts/spelling.txt: remove 'thead' as a typo 2023-07-27 13:07:04 -07:00
sphinx-pre-install
split-man.pl
stackdelta
stackusage
subarch.include
syscallhdr.sh
syscallnr.sh
syscalltbl.sh
tags.sh
test_fortify.sh
tools-support-relr.sh
unifdef.c
ver_linux
xen-hypercalls.sh
xz_wrap.sh