Merge 5.2-rc6 into usb-next

We need the USB fixes in here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 2 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 6dafa857bbb9..2a1be0d1a698 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -312,8 +312,6 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
                         btrfs_abort_transaction(trans, ret);
                         goto out_end_trans;
                 }
-                set_bit(BTRFS_INODE_COPY_EVERYTHING,
-                        &BTRFS_I(inode)->runtime_flags);
         } else {
                 ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL,
                                      0, 0);