Linux 4.11-rc6 drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Showing the changes to include/uapi (1 of 476 files). Show all
Unified · Split
| @@ -114,7 +114,7 @@ struct statx { · 113 unmodified lines | ||
| 114 | 114 | __u64 stx_ino; /* Inode number */ |
| 115 | 115 | __u64 stx_size; /* File size */ |
| 116 | 116 | __u64 stx_blocks; /* Number of 512-byte blocks allocated */ |
| 117 | − __u64 __spare1[1]; | |
| 117 | + __u64 stx_attributes_mask; /* Mask to show what's supported in stx_attributes */ | |
| 118 | 118 | /* 0x40 */ |
| 119 | 119 | struct statx_timestamp stx_atime; /* Last access time */ |
| 120 | 120 | struct statx_timestamp stx_btime; /* File creation time */ |
| @@ -152,9 +152,10 @@ struct statx { · 31 unmodified lines | ||
| 152 | 152 | #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ |
| 153 | 153 | #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ |
| 154 | 154 | #define STATX_ALL 0x00000fffU /* All currently supported flags */ |
| 155 | +#define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ | |
| 155 | 156 | |
| 156 | 157 | /* |
| 157 | − * Attributes to be found in stx_attributes | |
| 158 | + * Attributes to be found in stx_attributes and masked in stx_attributes_mask. | |
| 158 | 159 | * |
| 159 | 160 | * These give information about the features or the state of a file that might |
| 160 | 161 | * be of use to ordinary userspace programs such as GUIs or ls rather than |