From: David Sterba <dsterba@suse.com>
Date: Mon, 16 May 2016 13:46:29 +0000 (+0200)
Subject: Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516
X-Git-Tag: v6.1~16316^2~15^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=680834ca0ad4e9827048d4bda1e38db69c3dd1e4;p=sdk%2Femulator%2Femulator-kernel.git

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

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

680834ca0ad4e9827048d4bda1e38db69c3dd1e4
diff --cc include/uapi/linux/btrfs.h
index 3975e683af72,98aff38a70d3..23c6960e94a4
--- a/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