Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/gustavoars/linux.git
mariux64 · Oct 14, 2022 · eda1563 · eda1563
2 parents 5f9874b + 0811296
commit eda1563
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
@@ -131,7 +131,7 @@ struct fid {
  			u32 parent_block;
  			u32 parent_generation;
  		} udf;
-		__u32 raw[0];
+		DECLARE_FLEX_ARRAY(__u32, raw);
 	};
 };
 

diff --git a/include/linux/memremap.h b/include/linux/memremap.h
@@ -135,7 +135,7 @@ struct dev_pagemap {
 	int nr_range;
 	union {
 		struct range range;
-		struct range ranges[0];
+		DECLARE_FLEX_ARRAY(struct range, ranges);
 	};
 };