From: Linus Torvalds Date: Sun, 9 Feb 2014 19:12:26 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... X-Git-Tag: v4.13~7885 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9c1db7798141e2658e4b5bb170128dfdc3270ff4;p=mirror_ubuntu-bionic-kernel.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "This is a small collection of fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix data corruption when reading/updating compressed extents Btrfs: don't loop forever if we can't run because of the tree mod log btrfs: reserve no transaction units in btrfs_ioctl_set_features btrfs: commit transaction after setting label and features Btrfs: fix assert screwup for the pending move stuff --- 9c1db7798141e2658e4b5bb170128dfdc3270ff4