Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 28 insertions, 3 deletions

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index b6dec05c7196..dea893199257 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -206,7 +206,13 @@ struct btrfs_ioctl_feature_flags {
  */
 struct btrfs_balance_args {
         __u64 profiles;
-        __u64 usage;
+        union {
+                __le64 usage;
+                struct {
+                        __le32 usage_min;
+                        __le32 usage_max;
+                };
+        };
         __u64 devid;
         __u64 pstart;
         __u64 pend;
@@ -217,8 +223,27 @@ struct btrfs_balance_args {
 
         __u64 flags;
 
-        __u64 limit;            /* limit number of processed chunks */
-        __u64 unused[7];
+        /*
+         * BTRFS_BALANCE_ARGS_LIMIT with value 'limit'
+         * BTRFS_BALANCE_ARGS_LIMIT_RANGE - the extend version can use minimum
+         * and maximum
+         */
+        union {
+                __u64 limit;            /* limit number of processed chunks */
+                struct {
+                        __u32 limit_min;
+                        __u32 limit_max;
+                };
+        };
+
+        /*
+         * Process chunks that cross stripes_min..stripes_max devices,
+         * BTRFS_BALANCE_ARGS_STRIPES_RANGE
+         */
+        __le32 stripes_min;
+        __le32 stripes_max;
+
+        __u64 unused[6];
 } __attribute__ ((__packed__));
 
 /* report balance progress to userspace */