]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7e82c6 8f9e8f5)
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)
commite865f4965ff636cf18c9bed52dba44899ff63594
tree5a2f7b3ef069ffd3a3129871d8be0fbbd8388e78tree
parentc7e82c648598b6fc8aa65b4bb99b55b6dd23faadcommit | diff
parent8f9e8f5fcc059a3cba87ce837c88316797ef3645commit | diff
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
Ubuntu Artful kernel mirror