From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 17:37:38 +0000 (-0800)
Subject: Merge tag 'localmodconfig-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.14-rc1~178
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edde1fb8c41d0db7c8ce17fb32886da2e389b0cc;p=kernel%2Fkernel-generic.git

Merge tag 'localmodconfig-v3.14' of git://git./linux/kernel/git/rostedt/linux-kconfig

Pull localmodconfig update from Steven Rostedt:
 "While debugging the problem with localmodconfig and the ALSA codec
  modules all being set, I discovered a small bug in the dependency
  logic.

  If a config has a dependency based on its setting value,
  localmodcondig misses it.

  For example:

    config FOO
        default y if BAR || ZOO

  If FOO is needed for a module and is set to '=m', and so are BAR or
  ZOO, localmodconfig will not see that BAR or ZOO are also needed for
  the foo module, and will incorrectly disable them"

* tag 'localmodconfig-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
  localmodconfig: Add config depends by default settings
---

edde1fb8c41d0db7c8ce17fb32886da2e389b0cc