index
:
kernel_replicant_linux
debian/v5.10.70
history/5.0-rc6-android
history/5.10-rc2
history/5.2-rc-android
history/battery-charger-regulator
history/before-configuration-unification
history/lineage-16.0_i9300
history/minimize-diff
history/replicant-10/12-october-2020
history/replicant-10/5.3-rc6
history/replicant-10/5.8.rc2
history/replicant-10/5.8rc2
history/replicant-10/before-5.8rc2
history/replicant-10/before-5.8rc6
history/replicant-10/v5.8-rc6
history/replicant-11/25-09-2021
history/replicant-11/5.10.64
history/replicant-11/linux-5.10.71
history/replicant-11/replicant-11-recovery
history/replicant-5.1.7
history/replicant/10-v5.9-rc8
linux-libre/replicant/5.10.72
linux-libre/replicant/5.10.72-v2
linux-libre/scripts/5.10
linux-libre/scripts/5.10.72
replicant-10
replicant-11
replicant-11-test
replicant-9
udiv-emulation
wip-s6e8aa0-backlight-control
wip-sound-does-not-compile
Replicant kernel
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
scripts
/
kconfig
/
merge_config.sh
Commit message (
Expand
)
Author
Age
Files
Lines
*
kconfig: convert to SPDX License Identifier
Masahiro Yamada
2018-12-28
1
-9
/
+2
*
scripts/kconfig/merge_config: don't redefine 'y' to 'm'
Anders Roxell
2018-11-15
1
-8
/
+29
*
kconfig: merge_config: avoid false positive matches from comment lines
Masahiro Yamada
2018-11-11
1
-3
/
+4
*
merge_config.sh: Allow to define config prefix
Petr Vorel
2018-11-02
1
-1
/
+5
*
kconfig/merge_config.sh: Accept a single file
Gabriel de Perthuis
2015-10-14
1
-1
/
+1
*
kconfig/merge_config.sh: Support KCONFIG_CONFIG
Gabriel de Perthuis
2015-10-14
1
-4
/
+12
*
merge_config.sh: exit on missing input files
Sam Bobroff
2015-08-20
1
-0
/
+4
*
merge_config.sh: rename MAKE to RUNMAKE
Masahiro Yamada
2015-03-24
1
-3
/
+3
*
merge_config.sh: improve indentation
Masahiro Yamada
2015-03-24
1
-8
/
+6
*
kbuild: mergeconfig: move an error check to merge_config.sh
Masahiro Yamada
2015-03-24
1
-0
/
+5
*
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
Masahiro Yamada
2015-02-25
1
-1
/
+1
*
merge_config.sh: Display usage if given too few arguments
Olof Johansson
2015-01-07
1
-0
/
+5
*
merge_config.sh: Avoid creating unnessary source softlinks
John Stultz
2013-04-10
1
-1
/
+9
*
merge_config.sh: Add option to specify output dir
Zhangfei Gao
2012-12-09
1
-4
/
+16
*
merge_config.sh: Add option to display redundant configs
John Stultz
2012-03-30
1
-0
/
+9
*
merge_config.sh: Set execute bit
John Stultz
2012-03-30
1
-0
/
+0
*
merge_config.sh: Use the first file as the initial config
Josh Boyer
2012-03-24
1
-1
/
+5
*
merge_config.sh: fix bug in final check
John Stultz
2012-01-14
1
-2
/
+2
*
merge_config.sh: whitespace cleanup
Darren Hart
2012-01-14
1
-2
/
+2
*
merge_config.sh: use signal names compatible with dash and bash
Darren Hart
2012-01-14
1
-1
/
+1
*
kconfig: add merge_config.sh script
john stultz
2012-01-14
1
-0
/
+117