From: Linus Torvalds Date: Sat, 24 Jan 2015 02:31:27 +0000 (+1200) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~7302 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c4e00f1d31c4c83d15162782491689229bd92527;p=mirror_ubuntu-zesty-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: "We have a few fixes in my for-linus branch. Qu Wenruo's batch fix a regression between some our merge window pull and the inode_cache feature. The rest are smaller bugs" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: Don't call btrfs_start_transaction() on frozen fs to avoid deadlock. btrfs: Fix the bug that fs_info->pending_changes is never cleared. btrfs: fix state->private cast on 32 bit machines Btrfs: fix race deleting block group from space_info->ro_bgs list Btrfs: fix incorrect freeing in scrub_stripe btrfs: sync ioctl, handle errors after transaction start --- c4e00f1d31c4c83d15162782491689229bd92527