From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 15 Sep 2014 02:33:47 +0000 (-0700)
Subject: Merge 3.17-rc5 into staging-next.
X-Git-Tag: v3.18-rc1~130^2~438
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=caf382fe31b7327a1e4449f1c05c0cc7fb5b90be;p=platform%2Fkernel%2Flinux-exynos.git

Merge 3.17-rc5 into staging-next.

This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

caf382fe31b7327a1e4449f1c05c0cc7fb5b90be
diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 097ee1b,0c59e26..7f4ca32
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -574,8 -568,7 +574,8 @@@ static int client_common_fill_super(str
  	if (sb->s_root == NULL) {
  		CERROR("%s: can't make root dentry\n",
  			ll_get_fsname(sb, NULL, 0));
 -		GOTO(out_lock_cn_cb, err = -ENOMEM);
 +		err = -ENOMEM;
- 		goto out_root;
++		goto out_lock_cn_cb;
  	}
  
  	sbi->ll_sdev_orig = sb->s_dev;