]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2016 20:18:27 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Apr 2016 20:18:27 +0000 (13:18 -0700)
commitacee100bd7eb42f2e4ef13dbb585ff4053822b5b
tree5a2f7b3ef069ffd3a3129871d8be0fbbd8388e78
parentad978fbec1fce448f7d079a20cee42a86cabb936
parenta0d23eaa4ce7006115c99cfc1c68b6f205518a4e
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