Merge tag 'v4.0.2' into zygo-4.0.2-zb64

This is the 4.0.2 stable release

# gpg: Signature made Wed May  6 16:04:29 2015 EDT using RSA key ID 6092693E
# gpg: Can't check signature: public key not found

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/ioctl.c
index 5f0682af79c8a5b9d1a5bd08aa3801591d273ce5,f23d4be3280eb069735369b5bd77f3e0c54c6805..e6aa4d8db3fdf88af919d41a1daf31f6b31cda38
--- 1/fs/btrfs/ioctl.c
--- 2/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@@ -2901,13 -2897,12 +2901,16 @@@ static int btrfs_extent_same(struct ino
        if (src == dst)
                return -EINVAL;
  
+       if (len == 0)
+               return 0;
+ 
        btrfs_double_lock(src, loff, dst, dst_loff, len);
  
 -      ret = extent_same_check_offsets(src, loff, len);
 +      /* if we extend to both eofs, continue to block boundaries */
 +      if (loff + len == src->i_size && dst_loff + len == dst->i_size)
 +              len_aligned = ALIGN(src->i_size, bs) - loff;
 +
 +      ret = extent_same_check_offsets(src, loff, len, len_aligned);
        if (ret)
                goto out_unlock;