diff --git a/[refs] b/[refs]
index 77b6dfb3375f..b319bc1b4c9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b828925652340277a889cbc11b2d0637f7cdaf7
+refs/heads/master: e50a906e0200084f04f8f3b7c3a14b0442d1347f
diff --git a/trunk/security/commoncap.c b/trunk/security/commoncap.c
index 19cb398431ee..79713545cd63 100644
--- a/trunk/security/commoncap.c
+++ b/trunk/security/commoncap.c
@@ -413,6 +413,12 @@ int cap_inode_killpriv(struct dentry *dentry)
 	return 0;
 }
 
+int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps)
+{
+	memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
+ 	return -ENODATA;
+}
+
 static inline int get_file_caps(struct linux_binprm *bprm, bool *effective)
 {
 	bprm_clear_caps(bprm);