Evolution-X-Devices/kernel_realme_nemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4191d2ecdd7016ab6bbc04cde5981808c4ececce
kernel_realme_nemo/scripts
History
Anders Roxell 04a079b345 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>
(cherry picked from commit 6a130ec2f0646a8544308b6cf983269d5a2a7fa0)
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
2025-12-24 11:21:44 +00:00
..
basic
fixdep: trivial: typo fix and correction
2017-08-10 01:01:03 +09:00
coccinelle
fs: stream_open - opener for stream-like files so that read and write can run simultaneously without deadlock
2019-06-11 12:21:51 +02:00
dtc
Merge branch 'android-4.14-stable' of https://android.googlesource.com/kernel/common into android-4.14-mediatek
2022-02-04 14:08:47 +05:30
gcc-plugins
gcc-plugins: Rename last_stmt() for GCC 14+
2025-12-24 11:21:00 +00:00
gdb
scripts/gdb: fix debugging modules compiled with hot/cold partitioning
2019-12-05 15:37:04 +01:00
genksyms
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
kconfig
scripts: kconfig: merge_config: config files: add a trailing newline
2025-12-24 11:21:44 +00:00
ksymoops
…
mod
Merge 4.14.327 into android-4.14-stable
2023-10-11 19:14:52 +00:00
package
builddeb: Fix header package regarding dtc source links
2018-05-30 07:52:21 +02:00
selinux
selinux: use "grep -E" instead of "egrep"
2022-10-26 13:16:58 +02:00
tracing
scripts/tracing: fix the bug that can't parse raw_trace_func
2021-08-15 13:03:31 +02:00
.gitignore
Docs: clean up some DocBook loose ends
2017-06-23 14:17:38 -06:00
adjust_autoksyms.sh
kbuild: make scripts/adjust_autoksyms.sh robust against timestamp races
2018-05-30 07:52:17 +02:00
asn1_compiler.c
ASN.1: Fix check for strdup() success
2023-04-26 11:18:58 +02:00
bloat-o-meter
scripts: switch explicitly to Python 3
2021-06-03 08:36:11 +02:00
bootgraph.pl
scripts: Switch to more portable Perl shebang
2017-05-14 11:20:44 +09:00
check_00index.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
check_defconfigs
[ALPS05256456] scripts/check_defconfigs: enhance performance
2020-08-01 00:47:08 +08:00
check_extable.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
checkincludes.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
checkkconfigsymbols.py
…
checkpatch.pl
ANDROID: Snapshot Mainline's version of checkpatch.pl
2023-12-15 09:31:15 +00:00
checkstack.pl
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
2019-06-25 11:36:53 +08:00
checksyscalls.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
checkversion.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
clang-version.sh
UPSTREAM: kbuild: add clang-version.sh
2018-04-25 16:04:04 -07:00
cleanfile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
cleanpatch
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
coccicheck
coccinelle: fix parallel build with CHECK=scripts/coccicheck
2017-12-14 09:53:06 +01:00
config
tweewide: Fix most Shebang lines
2021-06-03 08:36:11 +02:00
conmakehash.c
…
const_structs.checkpatch
…
decode_stacktrace.sh
scripts/decode_stacktrace: strip basepath from all paths
2020-07-29 07:42:54 +02:00
decodecode
scripts/decodecode: fix trapping instruction formatting
2020-05-20 08:17:01 +02:00
depmod.sh
depmod: handle the case of /sbin/depmod without /sbin in PATH
2021-01-12 20:09:06 +01:00
diffconfig
scripts: switch explicitly to Python 3
2021-06-03 08:36:11 +02:00
export_report.pl
scripts: Switch to more portable Perl shebang
2017-05-14 11:20:44 +09:00
extract_xc3028.pl
scripts: Switch to more portable Perl shebang
2017-05-14 11:20:44 +09:00
extract-cert.c
ANDROID: extract-cert: omit PKCS#11 support if building against BoringSSL
2025-09-01 15:56:32 +02:00
extract-ikconfig
…
extract-module-sig.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
extract-sys-certs.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
extract-vmlinux
…
faddr2line
scripts/faddr2line: fix CROSS_COMPILE unset error
2018-02-07 11:12:17 -08:00
gcc-goto.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
gcc-ld
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
gcc-plugin.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
gcc-version.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
gcc-x86_32-has-stack-protector.sh
kbuild: Fix '-S -c' in x86 stack protector scripts
2025-12-24 11:21:22 +00:00
gcc-x86_64-has-stack-protector.sh
kbuild: Fix '-S -c' in x86 stack protector scripts
2025-12-24 11:21:22 +00:00
gen_initramfs_list.sh
Merge tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
2017-07-07 15:09:09 -07:00
generate_initcall_order.pl
ANDROID: generate_initcall_order.pl: Use two dash long options for llvm-nm
2021-07-21 20:40:31 -07:00
get_dvb_firmware
scripts: Switch to more portable Perl shebang
2017-05-14 11:20:44 +09:00
get_maintainer.pl
get_maintainer: Prepare for separate MAINTAINERS files
2017-08-08 11:09:31 -07:00
gfp-translate
…
headerdep.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
headers_check.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
headers_install.sh
linux/compiler.h: Split into compiler.h and compiler_types.h
2017-12-25 14:26:33 +01:00
headers.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
insert-sys-cert.c
…
kallsyms.c
scripts/kallsyms: fix definitely-lost memory leak
2020-01-04 13:59:51 +01:00
Kbuild.include
ANDROID: scripts/Kbuild: Force lld usage when LLVM=1 is used
2025-08-27 17:12:25 +05:30
kernel-doc
scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none
2018-02-25 11:07:58 +01:00
ld-version.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
leaking_addresses.pl
leaking_addresses: Always print a trailing newline
2021-11-26 11:40:28 +01:00
Lindent
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
link-vmlinux.sh
ANDROID: init: ensure initcall ordering with LTO
2019-12-13 07:14:18 -08:00
Makefile
Merge 4.14.224 into android-4.14-stable
2021-03-07 11:46:40 +01:00
Makefile.asm-generic
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Makefile.build
Merge 4.14.222 into android-4.14-stable
2021-02-23 14:55:38 +01:00
Makefile.clean
ANDROID: kbuild: Makefile.clean: make Kbuild and Makefile optional
2017-12-18 21:11:22 +05:30
Makefile.dtbinst
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Makefile.extrawarn
kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
2025-12-24 11:19:58 +00:00
Makefile.gcc-plugins
BACKPORT: kcov: test compiler capability in Kconfig and correct dependency
2020-01-13 19:38:49 +00:00
Makefile.headersinst
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Makefile.help
…
Makefile.host
kbuild: use HOSTLDFLAGS for single .c executables
2025-08-27 17:06:43 +05:30
Makefile.kasan
BACKPORT: kasan: remove use after scope bugs detection.
2019-07-10 09:14:22 -07:00
Makefile.kcov
BACKPORT: kcov: test compiler capability in Kconfig and correct dependency
2020-01-13 19:38:49 +00:00
Makefile.lib
scripts: Silence few dtc warnings by default
2023-01-05 11:38:18 +05:30
Makefile.modbuiltin
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Makefile.modinst
ANDROID: kbuild: make it possible to specify the module output dir
2017-12-18 21:11:22 +05:30
Makefile.modpost
Merge branch 'android-4.14-stable' of https://android.googlesource.com/kernel/common into HEAD
2022-09-07 17:56:45 +05:30
Makefile.modsign
scripts: Import oplus changes
2021-12-25 18:11:21 +05:30
Makefile.ubsan
Merge '4.14.326' of https://android.googlesource.com/kernel/common into lineage-20
2023-10-31 18:41:02 +05:30
makelst
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
markup_oops.pl
scripts: Switch to more portable Perl shebang
2017-05-14 11:20:44 +09:00
mkcompile_h
scripts: refactored & trimmed kernel version logic
2024-08-01 23:11:16 +05:30
mkmakefile
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mksysmap
mksysmap: Fix the mismatch of 'L0' symbols in System.map
2022-09-28 10:56:49 +02:00
mkuboot.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
module-common.lds
…
module-lto.lds
bpf: Update logging functions to work with BTF
2024-03-23 23:45:27 +05:30
module-lto.lds.S
ANDROID: kbuild: don't merge .*..compoundliteral in modules
2020-07-24 14:27:27 +00:00
namespace.pl
namespace: fix namespace.pl script to support relative paths
2019-10-29 09:16:59 +01:00
objdiff
…
parse-maintainers.pl
parse-maintainers: Mark as executable
2020-04-02 16:34:15 +02:00
patch-kernel
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
pnmtologo.c
…
profile2linkerlist.pl
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
prune-kernel
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
recordmcount.c
Merge 4.14.316 into android-4.14-stable
2023-05-30 17:53:01 +00:00
recordmcount.h
recordmcount: Fix spurious mcount entries on powerpc
2019-07-31 07:28:53 +02:00
recordmcount.pl
recordmcount.pl: fix typo in s390 mcount regex
2022-01-05 12:33:48 +01:00
setlocalversion
scripts/setlocalversion: make git describe output more reliable
2020-11-05 11:06:51 +01:00
show_delta
tweewide: Fix most Shebang lines
2021-06-03 08:36:11 +02:00
sign-file.c
sign-file: Fix incorrect return values check
2023-12-20 15:32:34 +01:00
sortextable.c
…
sortextable.h
…
spelling.txt
scripts/spelling.txt: add more spelling mistakes to spelling.txt
2017-10-03 17:54:23 -07:00
sphinx-pre-install
tweewide: Fix most Shebang lines
2021-06-03 08:36:11 +02:00
stackdelta
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
stackusage
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
tags.sh
scripts/tags.sh: Resolve gtags empty index generation
2023-08-11 11:33:32 +02:00
unifdef.c
unifdef: use memcpy instead of strncpy
2018-12-08 13:03:35 +01:00
ver_linux
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xen-hypercalls.sh
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xz_wrap.sh
…