index
:
BMC/Intel-BMC/linux.git
dev
dev-4.10
dev-4.13
dev-4.17
dev-4.18
dev-4.19
dev-4.3
dev-4.4
dev-4.6
dev-4.7
dev-5.0
dev-5.1
dev-5.10-intel
dev-5.10.46-intel
dev-5.10.49-intel
dev-5.14-intel
dev-5.15-intel
dev-5.2
dev-5.3
dev-5.4
dev-5.7
dev-5.8
dev-5.8-intel
master
Intel OpenBMC Linux kernel source tree (mirror)
Andrey V.Kosteltsev
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
scripts
/
kconfig
/
merge_config.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2021-08-10
scripts: merge_config: add strict mode to fail upon any redefinition
Matthias Maennich
1
-0
/
+15
2019-09-04
merge_config.sh: ignore unwanted grep errors
Guillaume Tucker
1
-1
/
+1
2019-08-21
merge_config.sh: Check error codes from make
Mark Brown
1
-5
/
+5
2018-12-28
kconfig: convert to SPDX License Identifier
Masahiro Yamada
1
-9
/
+2
2018-11-15
scripts/kconfig/merge_config: don't redefine 'y' to 'm'
Anders Roxell
1
-8
/
+29
2018-11-11
kconfig: merge_config: avoid false positive matches from comment lines
Masahiro Yamada
1
-3
/
+4
2018-11-01
merge_config.sh: Allow to define config prefix
Petr Vorel
1
-1
/
+5
2015-10-14
kconfig/merge_config.sh: Accept a single file
Gabriel de Perthuis
1
-1
/
+1
2015-10-14
kconfig/merge_config.sh: Support KCONFIG_CONFIG
Gabriel de Perthuis
1
-4
/
+12
2015-08-20
merge_config.sh: exit on missing input files
Sam Bobroff
1
-0
/
+4
2015-03-24
merge_config.sh: rename MAKE to RUNMAKE
Masahiro Yamada
1
-3
/
+3
2015-03-24
merge_config.sh: improve indentation
Masahiro Yamada
1
-8
/
+6
2015-03-24
kbuild: mergeconfig: move an error check to merge_config.sh
Masahiro Yamada
1
-0
/
+5
2015-02-25
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
Masahiro Yamada
1
-1
/
+1
2015-01-07
merge_config.sh: Display usage if given too few arguments
Olof Johansson
1
-0
/
+5
2013-04-10
merge_config.sh: Avoid creating unnessary source softlinks
John Stultz
1
-1
/
+9
2012-12-09
merge_config.sh: Add option to specify output dir
Zhangfei Gao
1
-4
/
+16
2012-03-30
merge_config.sh: Add option to display redundant configs
John Stultz
1
-0
/
+9
2012-03-30
merge_config.sh: Set execute bit
John Stultz
1
-0
/
+0
2012-03-25
merge_config.sh: Use the first file as the initial config
Josh Boyer
1
-1
/
+5
2012-01-15
merge_config.sh: fix bug in final check
John Stultz
1
-2
/
+2
2012-01-15
merge_config.sh: whitespace cleanup
Darren Hart
1
-2
/
+2
2012-01-15
merge_config.sh: use signal names compatible with dash and bash
Darren Hart
1
-1
/
+1
2012-01-15
kconfig: add merge_config.sh script
john stultz
1
-0
/
+117