From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2016 20:39:37 +0000 (-0700)
Subject: Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v5.15~12838
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b22734a55067adbc10216e459762dbd7dcef29d5;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-linus-4.8' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "Josef fixed a problem when quotas are enabled with his latest ENOSPC
  rework, and Jeff added more checks into the subvol ioctls to avoid
  tripping up lookup_one_len"

* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: ensure that file descriptor used with subvol ioctls is a dir
  Btrfs: handle quota reserve failure properly
---

b22734a55067adbc10216e459762dbd7dcef29d5