Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 17:56:06 +0000 (10:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 17:56:06 +0000 (10:56 -0700)
commit3206e7d5e25ef94b5a29e2c81e6fb8d5fb48422f
tree15c5b41a5d1fd4d0576d19637dff19922460afcd
parentcbaff8763d67f51812aa78e6c7771ab53dbff38f
parentac3d79392f8c2728f7600dd32ed88b3a1bfdc1af
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull quota fix from Jan Kara:
 "A fix for a regression in handling of quota grace times and warnings"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Generate warnings for DQUOT_SPACE_NOFAIL allocations