index
:
kernel/linux.git
linux-2.6.11.y
linux-2.6.12.y
linux-2.6.13.y
linux-2.6.14.y
linux-2.6.15.y
linux-2.6.16.y
linux-2.6.17.y
linux-2.6.18.y
linux-2.6.19.y
linux-2.6.20.y
linux-2.6.21.y
linux-2.6.22.y
linux-2.6.23.y
linux-2.6.24.y
linux-2.6.25.y
linux-2.6.26.y
linux-2.6.27.y
linux-2.6.28.y
linux-2.6.29.y
linux-2.6.30.y
linux-2.6.31.y
linux-2.6.32.y
linux-2.6.33.y
linux-2.6.34.y
linux-2.6.35.y
linux-2.6.36.y
linux-2.6.37.y
linux-2.6.38.y
linux-2.6.39.y
linux-3.0.y
linux-3.1.y
linux-3.10.y
linux-3.11.y
linux-3.12.y
linux-3.13.y
linux-3.14.y
linux-3.15.y
linux-3.16.y
linux-3.17.y
linux-3.18.y
linux-3.19.y
linux-3.2.y
linux-3.3.y
linux-3.4.y
linux-3.5.y
linux-3.6.y
linux-3.7.y
linux-3.8.y
linux-3.9.y
linux-4.0.y
linux-4.1.y
linux-4.10.y
linux-4.11.y
linux-4.12.y
linux-4.13.y
linux-4.14.y
linux-4.15.y
linux-4.16.y
linux-4.17.y
linux-4.18.y
linux-4.19.y
linux-4.2.y
linux-4.20.y
linux-4.3.y
linux-4.4.y
linux-4.5.y
linux-4.6.y
linux-4.7.y
linux-4.8.y
linux-4.9.y
linux-5.0.y
linux-5.1.y
linux-5.10.y
linux-5.11.y
linux-5.12.y
linux-5.13.y
linux-5.14.y
linux-5.15.y
linux-5.16.y
linux-5.17.y
linux-5.18.y
linux-5.19.y
linux-5.2.y
linux-5.3.y
linux-5.4.y
linux-5.5.y
linux-5.6.y
linux-5.7.y
linux-5.8.y
linux-5.9.y
linux-6.0.y
linux-6.1.y
linux-6.10.y
linux-6.11.y
linux-6.12.y
linux-6.2.y
linux-6.3.y
linux-6.4.y
linux-6.5.y
linux-6.6.y
linux-6.7.y
linux-6.8.y
linux-6.9.y
linux-rockchip-6.1.y
linux-rockchip-6.5.y
linux-rolling-lts
linux-rolling-stable
master
Linux kernel stable 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
2023-03-23
scripts: merge_config: Fix typo in variable name.
Mirsad Goran Todorovac
1
-1
/
+1
2023-02-13
scripts: merge_config: Add option to suppress warning on overrides
Mark Brown
1
-9
/
+16
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
