Skip to content

Commit

Permalink
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/gustavoars/linux.git
  • Loading branch information
Stephen Rothwell committed Sep 16, 2022
2 parents a555405 + 0811296 commit 7fcb7bf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/can/usb/etas_es58x/es58x_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ union es58x_urb_cmd {
u8 cmd_type;
u8 cmd_id;
} __packed;
u8 raw_cmd[0];
DECLARE_FLEX_ARRAY(u8, raw_cmd);
};

/**
Expand Down
2 changes: 1 addition & 1 deletion include/linux/exportfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct fid {
u32 parent_block;
u32 parent_generation;
} udf;
__u32 raw[0];
DECLARE_FLEX_ARRAY(__u32, raw);
};
};

Expand Down
2 changes: 1 addition & 1 deletion include/linux/memremap.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ struct dev_pagemap {
int nr_range;
union {
struct range range;
struct range ranges[0];
DECLARE_FLEX_ARRAY(struct range, ranges);
};
};

Expand Down

0 comments on commit 7fcb7bf

Please sign in to comment.