diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-19 21:32:26 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-19 23:05:20 -0400 |
| commit | 2c33ce009ca2389dbf0535d0672214d09738e35e (patch) | |
| tree | 6186a6458c3c160385d794a23eaf07c786a9e61b /include/uapi/linux/magic.h | |
| parent | cec32a47010647e8b0603726ebb75b990a4057a4 (diff) | |
| parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 (diff) | |
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/uapi/linux/magic.h')
| -rw-r--r-- | include/uapi/linux/magic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 7d664ea85ebd..7b1425a6b370 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h | |||
| @@ -58,6 +58,8 @@ | |||
| 58 | 58 | ||
| 59 | #define STACK_END_MAGIC 0x57AC6E9D | 59 | #define STACK_END_MAGIC 0x57AC6E9D |
| 60 | 60 | ||
| 61 | #define TRACEFS_MAGIC 0x74726163 | ||
| 62 | |||
| 61 | #define V9FS_MAGIC 0x01021997 | 63 | #define V9FS_MAGIC 0x01021997 |
| 62 | 64 | ||
| 63 | #define BDEVFS_MAGIC 0x62646576 | 65 | #define BDEVFS_MAGIC 0x62646576 |