index
:
daniel.thompson/linux.git
backlight-for-v4.11
backport/arm64_nmi-android-3.18
bugs/debug_ll
bugs/st-asc-avalanche
clang-analyzer/initial_review
dev/arm64_alternative_if_not
dev/arm64_nix_assembler_macros
dev/arm64_nmi-v4.0
dev/arm64_nmi-v4.10
dev/arm64_nmi-v4.11
dev/arm64_nmi-v4.5
dev/arm64_nmi-v4.7-rc3
dev/arm64_nmi-v4.8
dev/arm64_nmi-v5
dev/arm_backtrace_on_apq8064
dev/arm_better_perf
dev/baseline
dev/debugll_sa1100
dev/imx_poll_get_char
dev/kdb-fiq
dev/kdb-fiq-v0.9
dev/kdb-interrupt
dev/kdb-kiosk
dev/kdb-nmi
dev/kdb_better_search
dev/kdb_ftdump
dev/kdb_no_log_levels
dev/kgdb-timeout
dev/kgdb_nmi-no_con_enabled
dev/kgdb_nmi_fiq-2
dev/msm_drm_prime_mmap-2
dev/multi_debug_ll
dev/out-of-tree
dev/perf_nmi_fiq
dev/perf_single_irq
dev/pl011-no-containerof
dev/readbwl_relaxed
dev/sched_clock_nmi-2
dev/st-asc-relaxed
dev/trigger_backtrace
dev/trigger_backtrace-v4.5
dev/trigger_backtrace-v4.6
dev/trigger_backtrace-v4.7
dev/trigger_backtrace-v4.8
developerbox/hacking
developerbox/hacking-v4.14
features/b2020-eth1
features/edid-svga
features/get_user_8
hacking/android-4.1
hacking/db820c-v4.10
hacking/fvp
hacking/ifc6410
hacking/perf
hacking/perf-reboot
hacking/pixel
hacking/x20-3.18
hacking/x20-3.18-fix_includes
honeycomb/vendor-rebase-v4.19
honeycomb/vendor-rebase-v5.0
ifc6410_lollipop
kdb/seq_file
kgdb/for-next
kgdb/kdb_read_cleanup
kgdb/polled_request_irq
linux-next
master
merge/fiq
merge/for_jason-3.20
misc/coccinelle_allow_list_entry_is_head
misc/compile_commands_for_gcc
pinebookpro/hacking-5.8
rda/hacking
rda/v3.10.62-r0
rda/v3.10.62-r1
rda/v3.10.62-r2
rda/v3.10.62-r3
tty-next
Personal repo for development and upstreaming. Contains significant work on NMI/FIQ.
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
scripts
/
kconfig
/
merge_config.sh
Age
Commit message (
Expand
)
Author
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