Merge tag 'v4.2.5' into zygo-4.2.5-zb64

This is the 4.2.5 stable release

# gpg: Signature made Mon Oct 26 20:54:04 2015 EDT using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 647F 2865 4894 E3BD 4571  99BE 38DB BDC8 6092 693E

diff --cc fs/btrfs/volumes.h
index 1ebc3b90daec425c9e68954fbb3fff32bfcb727d,2ac5f8cd701ad2ce3221cd1db573bf9013d7ef64..68447992915b1c350e7e61e3c772ca5ca85e2fe3
--- 1/fs/btrfs/volumes.h
--- 2/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@@ -375,8 -375,7 +375,16 @@@ struct map_lookup 
  #define BTRFS_BALANCE_ARGS_DRANGE     (1ULL << 3)
  #define BTRFS_BALANCE_ARGS_VRANGE     (1ULL << 4)
  #define BTRFS_BALANCE_ARGS_LIMIT      (1ULL << 5)
 +#define BTRFS_BALANCE_ARGS_STRIPES    (1ULL << 6)
 +
++#define BTRFS_BALANCE_ARGS_MASK                       \
++      (BTRFS_BALANCE_ARGS_PROFILES |          \
++       BTRFS_BALANCE_ARGS_USAGE |             \
++       BTRFS_BALANCE_ARGS_DEVID |             \
++       BTRFS_BALANCE_ARGS_DRANGE |            \
++       BTRFS_BALANCE_ARGS_VRANGE |            \
++       BTRFS_BALANCE_ARGS_LIMIT)
+ 
  #define BTRFS_BALANCE_ARGS_MASK                       \
        (BTRFS_BALANCE_ARGS_PROFILES |          \
         BTRFS_BALANCE_ARGS_USAGE |             \