diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 (patch) | |
| tree | add380154271f9a68be4099590f912b4ab4bed9f /fs/namespace.c | |
| parent | b5210b2a34bae35fc00675462333af45676d727c (diff) | |
| parent | f1923820c447e986a9da0fc6bf60c1dccdf0408e (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c
Merge in the latest fixes before applying new patches, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d581e45c0a9f..341d3f564082 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1690,7 +1690,7 @@ static int do_loopback(struct path *path, const char *old_name, if (IS_ERR(mnt)) { err = PTR_ERR(mnt); - goto out; + goto out2; } err = graft_tree(mnt, path); |