diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
| commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
| tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /include/linux/user_namespace.h | |
| parent | 75864b301c91bf41ec2fb49ce4efb62fcb48b954 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'include/linux/user_namespace.h')
| -rw-r--r-- | include/linux/user_namespace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 32354b4b4b2b..b3575ce29148 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h | |||
| @@ -66,7 +66,7 @@ struct user_namespace { | |||
| 66 | #endif | 66 | #endif |
| 67 | struct ucounts *ucounts; | 67 | struct ucounts *ucounts; |
| 68 | int ucount_max[UCOUNT_COUNTS]; | 68 | int ucount_max[UCOUNT_COUNTS]; |
| 69 | }; | 69 | } __randomize_layout; |
| 70 | 70 | ||
| 71 | struct ucounts { | 71 | struct ucounts { |
| 72 | struct hlist_node node; | 72 | struct hlist_node node; |