From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Apr 2016 20:18:27 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v4.6-rc3~32
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/e865f4965ff636cf18c9bed52dba44899ff63594

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull quota fixes from Jan Kara:
 "Fixes for oopses when the new quotactl gets used with quotas disabled"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas
  quota: Handle Q_GETNEXTQUOTA when quota is disabled
---

e865f4965ff636cf18c9bed52dba44899ff63594