diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-08-09 13:07:28 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-08-09 13:07:28 -0500 |
| commit | 3f61fd41f38328f0a585eaba2d72d339fe9aecda (patch) | |
| tree | 4a6fe7dc98a44dec003833a7fa440daa6c304a28 /include/uapi/linux/magic.h | |
| parent | 6ca523d7eb198b78f79df882b7dc4a8c795d8777 (diff) | |
| parent | e21a712a9685488f5ce80495b37b9fdbe96c230d (diff) | |
| download | cachepc-linux-3f61fd41f38328f0a585eaba2d72d339fe9aecda.tar.gz cachepc-linux-3f61fd41f38328f0a585eaba2d72d339fe9aecda.zip | |
Merge tag 'v5.3-rc3' into drm-next-5.4
Linux 5.3-rc3
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'include/uapi/linux/magic.h')
| -rw-r--r-- | include/uapi/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 665e18627f78..1274c692e59c 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -92,5 +92,6 @@ #define BALLOON_KVM_MAGIC 0x13661366 #define ZSMALLOC_MAGIC 0x58295829 #define DMA_BUF_MAGIC 0x444d4142 /* "DMAB" */ +#define Z3FOLD_MAGIC 0x33 #endif /* __LINUX_MAGIC_H__ */ |