diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-14 11:14:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-14 11:14:34 +0200 |
| commit | 3559ff9650224a4af6b777a5df786f521f66db5a (patch) | |
| tree | ff1d9ec0e27ab4b452f1d8b12485d21102900597 /include/uapi/linux/btrfs.h | |
| parent | 70e0d117f2502f19517be03a64b3c513f31b3cdb (diff) | |
| parent | db06d759d6cf903aeda8c107fd3abd366dd80200 (diff) | |
| download | linux-next-3559ff9650224a4af6b777a5df786f521f66db5a.tar.gz linux-next-3559ff9650224a4af6b777a5df786f521f66db5a.zip | |
Merge branch 'linus' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/btrfs.h')
| -rw-r--r-- | include/uapi/linux/btrfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 23c6960e94a4..2bdd1e3e7007 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { }; union { char name[BTRFS_SUBVOL_NAME_MAX + 1]; - u64 devid; + __u64 devid; }; }; |