Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516

# Conflicts:
#	include/uapi/linux/btrfs.h

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/volumes.h
Simple merge

diff --cc include/uapi/linux/btrfs.h
index 3975e683af72009634f963d3353a40a5aedea2b7,98aff38a70d3cc1d2913b131b7de362e7fbe33e5..23c6960e94a4fa268dbd8286be6a993ebbd6ce12
--- 1/include/uapi/linux/btrfs.h
--- 2/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@@ -33,17 -34,6 +34,14 @@@ struct btrfs_ioctl_vol_args 
  
  #define BTRFS_DEVICE_PATH_NAME_MAX 1024
  
- #define BTRFS_SUBVOL_CREATE_ASYNC     (1ULL << 0)
- #define BTRFS_SUBVOL_RDONLY           (1ULL << 1)
- #define BTRFS_SUBVOL_QGROUP_INHERIT   (1ULL << 2)
 +#define BTRFS_DEVICE_SPEC_BY_ID               (1ULL << 3)
 +
 +#define BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED              \
 +                      (BTRFS_SUBVOL_CREATE_ASYNC |    \
 +                      BTRFS_SUBVOL_RDONLY |           \
 +                      BTRFS_SUBVOL_QGROUP_INHERIT |   \
 +                      BTRFS_DEVICE_SPEC_BY_ID)
 +
  #define BTRFS_FSID_SIZE 16
  #define BTRFS_UUID_SIZE 16
  #define BTRFS_UUID_UNPARSED_SIZE      37