From: Linus Torvalds Date: Sun, 9 Aug 2015 02:56:31 +0000 (+0300) Subject: Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... X-Git-Tag: v4.14-rc1~4916 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af0b3152bbfebd3f8291fd61988c12ece4f60f57;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'for-linus-4.2' of git://git./linux/kernel/git/mason/linux-btrfs Pull btrfs fix from Chris Mason: "We have a btrfs quota regression fix. I merged this one on Thursday and have run it through tests against current master. Normally I wouldn't have sent this while you were finalizing rc6, but I'm feeding mosquitoes in the adirondacks next week, so I wanted to get this one out before leaving. I'll leave longer tests running and check on things during the week, but I don't expect any problems" * 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: qgroup: Fix a regression in qgroup reserved space. --- af0b3152bbfebd3f8291fd61988c12ece4f60f57