diff --git a/[refs] b/[refs]
index c32f10299bea..e458655c0a98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6dd012efc8c785f8dc2441ae21ae48561788821
+refs/heads/master: aeac64aac538fde7c11038fc6dd2ef4bec4c39a7
diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c
index 7c0fda4106a0..7a6dd966931b 100644
--- a/trunk/drivers/staging/zcache/zcache-main.c
+++ b/trunk/drivers/staging/zcache/zcache-main.c
@@ -19,6 +19,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
+#include <linux/string.h>
 #include <linux/atomic.h>
 #include <linux/math64.h>
 #include <linux/crypto.h>
@@ -1688,7 +1689,7 @@ __setup("nocleancacheignorenonactive", no_cleancache_ignore_nonactive);
 
 static int __init enable_zcache_compressor(char *s)
 {
-	strncpy(zcache_comp_name, s, ZCACHE_COMP_NAME_SZ);
+	strlcpy(zcache_comp_name, s, sizeof(zcache_comp_name));
 	zcache_enabled = true;
 	return 1;
 }