[GIT PULL] kconfig changes for v4.1-rc1

[Michal Marek]

Hi Linus,

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

Michal

The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539:

  Linux 4.0-rc1 (2015-02-22 18:21:14 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig

for you to fetch changes up to 0a1f00a1c86421cc07cec87011c7cf4df68ee54b:

  kconfig: Do not print status messages in make -s mode (2015-04-09 17:44:34 +0200)

----------------------------------------------------------------
Masahiro Yamada (7):
      kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
      kbuild: mergeconfig: fix "jobserver unavailable" warning
      kbuild: mergeconfig: move an error check to merge_config.sh
      kbuild: mergeconfig: remove redundant $(objtree)
      merge_config.sh: improve indentation
      merge_config.sh: rename MAKE to RUNMAKE
      kbuild: add generic mergeconfig target, %.config

Michal Marek (5):
      kconfig: Get rid of the P() macro in headers
      kconfig: Remove dead code
      kconfig: Remove unnecessary prototypes from headers
      kconfig: Simplify Makefile
      kconfig: Do not print status messages in make -s mode

 scripts/kconfig/Makefile        | 80 +++++++++++++++++++-------------------
 scripts/kconfig/conf.c          |  8 +++-
 scripts/kconfig/confdata.c      |  5 +++
 scripts/kconfig/expr.c          | 22 ++++++-----
 scripts/kconfig/expr.h          |  5 ---
 scripts/kconfig/gconf.c         | 29 ++------------
 scripts/kconfig/lkc.h           | 14 -------
 scripts/kconfig/lkc_proto.h     | 85 +++++++++++++++++++----------------------
 scripts/kconfig/mconf.c         | 31 ++++++++++-----
 scripts/kconfig/menu.c          |  4 +-
 scripts/kconfig/merge_config.sh | 27 +++++++------
 scripts/kconfig/nconf.c         |  5 +++
 scripts/kconfig/qconf.cc        |  5 ++-
 scripts/kconfig/symbol.c        | 42 ++++++++++----------
 scripts/kconfig/util.c          | 10 -----
 15 files changed, 174 insertions(+), 198 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/