tree 777358b8bb7c474567edac1c7c958a604fdb65b9
parent d4c2456a1888d7914502f4237b2ca4e262dd4c4d
parent e97e548ba8baffe051146d1f5e897dec48da20e0
author Linus Torvalds <torvalds@linux-foundation.org> 1369411133 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1369411133 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes

Pull gfs2 fixes from Steven Whitehouse:
 "This time there are just four fixes.  There are a couple of minor
  updates to the quota code, a fix for KConfig to ensure that only valid
  combinations including GFS2 can be built, and a fix for a typo
  affecting end i/o processing when writing the journal.

  Also, there is a temporary fix for a performance regression relating
  to block reservations and directories.  A longer fix will be applied
  in due course, but this deals with the most immediate problem for now"

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Fix typo in gfs2_log_end_write loop
  GFS2: fix DLM depends to fix build errors
  GFS2: Use single-block reservations for directories
  GFS2: two minor quota fixups