index
:
linux-arm.git
aarch64/hotplug-vcpu/head
aarch64/hotplug-vcpu/v6.5
aarch64/hotplug-vcpu/v6.6
aarch64/hotplug-vcpu/v6.6-rc1
aarch64/hotplug-vcpu/v6.6-rc5
aarch64/hotplug-vcpu/v6.6-rc6
aarch64/hotplug-vcpu/v6.6-rc7
aarch64/hotplug-vcpu/v6.7
aarch64/hotplug-vcpu/v6.7-rc1
aarch64/hotplug-vcpu/v6.7-rc2
aarch64/hotplug-vcpu/v6.7-rc3
aarch64/hotplug-vcpu/v6.7-rc4
aarch64/hotplug-vcpu/v6.7-rc5
aarch64/hotplug-vcpu/v6.8-rc2
aarch64/ktext/head
aarch64/ktext/v6.5
aarch64/ktext/v6.6-rc5
aarch64/ktext/v6.7
adfs
cex7
clearfog
clearfog-4.10
clearfog-4.11
clearfog-4.12
clearfog-4.13
clearfog-4.9
clkdev
csi-v6
devel-stable
drm-armada-devel
drm-armada-devel-4.15
drm-armada-fixes
drm-armada-fixes-4.15
drm-dwhdmi-devel
drm-etnaviv-devel
drm-tda9950-fixes
drm-tda998x-devel
drm-tda998x-fixes
fec-testing
fiq
fixes
fixes-sa1111
for-arm-soc
for-next
hb2
ktext
ktext-current
master
mcbin
mvneta
mvpp2
net-merged
net-next
net-queue
nmi
phy
rtc
sa1100
spectre
to-build
uaccess
vcpu-rmk
wl18xx
zii
Russell King's ARM Linux kernel tree
Russell King
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
scripts
/
kconfig
/
merge_config.sh
Age
Commit message (
Expand
)
Author
2021-08-10
scripts: merge_config: add strict mode to fail upon any redefinition
Matthias Maennich
2019-09-04
merge_config.sh: ignore unwanted grep errors
Guillaume Tucker
2019-08-22
merge_config.sh: Check error codes from make
Mark Brown
2018-12-28
kconfig: convert to SPDX License Identifier
Masahiro Yamada
2018-11-15
scripts/kconfig/merge_config: don't redefine 'y' to 'm'
Anders Roxell
2018-11-11
kconfig: merge_config: avoid false positive matches from comment lines
Masahiro Yamada
2018-11-02
merge_config.sh: Allow to define config prefix
Petr Vorel
2015-10-14
kconfig/merge_config.sh: Accept a single file
Gabriel de Perthuis
2015-10-14
kconfig/merge_config.sh: Support KCONFIG_CONFIG
Gabriel de Perthuis
2015-08-20
merge_config.sh: exit on missing input files
Sam Bobroff
2015-03-24
merge_config.sh: rename MAKE to RUNMAKE
Masahiro Yamada
2015-03-24
merge_config.sh: improve indentation
Masahiro Yamada
2015-03-24
kbuild: mergeconfig: move an error check to merge_config.sh
Masahiro Yamada
2015-02-25
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
Masahiro Yamada
2015-01-07
merge_config.sh: Display usage if given too few arguments
Olof Johansson
2013-04-10
merge_config.sh: Avoid creating unnessary source softlinks
John Stultz
2012-12-09
merge_config.sh: Add option to specify output dir
Zhangfei Gao
2012-03-30
merge_config.sh: Add option to display redundant configs
John Stultz
2012-03-30
merge_config.sh: Set execute bit
John Stultz
2012-03-24
merge_config.sh: Use the first file as the initial config
Josh Boyer
2012-01-14
merge_config.sh: fix bug in final check
John Stultz
2012-01-14
merge_config.sh: whitespace cleanup
Darren Hart
2012-01-14
merge_config.sh: use signal names compatible with dash and bash
Darren Hart
2012-01-14
kconfig: add merge_config.sh script
john stultz