diff --git a/[refs] b/[refs]
index 3a312c53b81e..e21c08cef5be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a0d8f5d1e9c4a91ee97fc590abbf6e56803769
+refs/heads/master: 3585e96cd1049682b8a19a0b699422156e9d735b
diff --git a/trunk/security/integrity/integrity.h b/trunk/security/integrity/integrity.h
index 403ba319a06a..e9db763a875e 100644
--- a/trunk/security/integrity/integrity.h
+++ b/trunk/security/integrity/integrity.h
@@ -48,7 +48,7 @@ struct integrity_iint_cache {
 	struct rb_node rb_node; /* rooted in integrity_iint_tree */
 	struct inode *inode;	/* back pointer to inode in question */
 	u64 version;		/* track inode changes */
-	unsigned char flags;
+	unsigned short flags;
 	struct evm_ima_xattr_data ima_xattr;
 	enum integrity_status ima_status;
 	enum integrity_status evm_status;