diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-11 01:34:30 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-11 01:34:30 +0100 |
| commit | a8fa94e0f2ab665f9aa665195618178b61ed8304 (patch) | |
| tree | 4060502fffd7f56d379372d517f8dcc31bf63955 /lib/Kconfig.debug | |
| parent | kernfs: fix hash calculation in kernfs_rename_ns() (diff) | |
| parent | Linux 3.14-rc2 (diff) | |
| download | linux-a8fa94e0f2ab665f9aa665195618178b61ed8304.tar.xz linux-a8fa94e0f2ab665f9aa665195618178b61ed8304.zip | |
Merge branch 'master' into driver-core-next-test-merge-rc2
da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next. The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next. The conflict can be resolved by taking code from
driver-core-next.
Conflicts:
fs/kernfs/dir.c
Diffstat (limited to 'lib/Kconfig.debug')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index dbf94a7d25a8..a48abeac753f 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -119,7 +119,7 @@ menu "Compile-time checks and compiler options" config DEBUG_INFO bool "Compile the kernel with debug info" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && !COMPILE_TEST help If you say Y here the resulting kernel image will include debugging info resulting in a larger kernel image. |