diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 11:24:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 11:24:41 -0700 |
| commit | c841e12add6926d64aa608687893465330b5a03e (patch) | |
| tree | 82ff9747cd50ecde3eff0951ded268806e5976a5 /drivers/net | |
| parent | b422b75875a3663f08a9ab5aeb265ed2383cbe2f (diff) | |
| parent | 0a1f00a1c86421cc07cec87011c7cf4df68ee54b (diff) | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig updates from Michal Marek:
"Here is the kconfig stuff for v4.1-rc1:
- fixes for mergeconfig (used by make kvmconfig/tinyconfig)
- header cleanup
- make -s *config is silent now"
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kconfig: Do not print status messages in make -s mode
kconfig: Simplify Makefile
kbuild: add generic mergeconfig target, %.config
merge_config.sh: rename MAKE to RUNMAKE
merge_config.sh: improve indentation
kbuild: mergeconfig: remove redundant $(objtree)
kbuild: mergeconfig: move an error check to merge_config.sh
kbuild: mergeconfig: fix "jobserver unavailable" warning
kconfig: Remove unnecessary prototypes from headers
kconfig: Remove dead code
kconfig: Get rid of the P() macro in headers
kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions