diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-01 02:49:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-01 03:31:25 -0400 |
| commit | 0a54cec0c25cc49e3b68b14c205f1f6cff13f5e1 (patch) | |
| tree | eb4e63ee9ae1fcaf9aa53a1668e55c09516052d9 /arch/powerpc/configs/mpc5200_defconfig | |
| parent | ec8c27e04f89a7575ca2c4facb99152e03d6a99c (diff) | |
| parent | 980019d74e4b2428362b36a0506519d6d9460800 (diff) | |
Merge branch 'linus' into core/rcu
Conflicts:
fs/fs-writeback.c
Merge reason: Resolve the conflict
Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:
b97181f: fs: remove all rcu head initializations, except on_stack initializations
As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/configs/mpc5200_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc5200_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 7012ac0134f0..f875ec21c91c 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig | |||
| @@ -97,8 +97,7 @@ CONFIG_RCU_FANOUT=32 | |||
| 97 | # CONFIG_IKCONFIG is not set | 97 | # CONFIG_IKCONFIG is not set |
| 98 | CONFIG_LOG_BUF_SHIFT=14 | 98 | CONFIG_LOG_BUF_SHIFT=14 |
| 99 | # CONFIG_CGROUPS is not set | 99 | # CONFIG_CGROUPS is not set |
| 100 | CONFIG_SYSFS_DEPRECATED=y | 100 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 101 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 102 | # CONFIG_RELAY is not set | 101 | # CONFIG_RELAY is not set |
| 103 | CONFIG_NAMESPACES=y | 102 | CONFIG_NAMESPACES=y |
| 104 | # CONFIG_UTS_NS is not set | 103 | # CONFIG_UTS_NS is not set |