The following changes since commit 3c8fb50445833b93f69b6b703a29aae3523cad0c:
Merge tag 'pm+acpi-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2014-06-19 18:58:57 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git tags/gfs2-fixes
for you to fetch changes up to 27ff6a0f7f5bf500e9d2a8760c062789b52c551f:
GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes (2014-07-18 11:15:14 +0100)
----------------------------------------------------------------
This patch set contains two minor docs/spelling fixes, some fixes for
flock, a change to use GFP_NOFS to avoid recursion on a rarely used
code path and a fix for a race relating to the glock lru.
----------------------------------------------------------------
Bob Peterson (3):
GFS2: Only wait for demote when last holder is dequeued
GFS2: Allow flocks to use normal glock dq rather than dq_wait
GFS2: Allow caching of glocks for flock
Fabian Frederick (2):
GFS2: replace count*size kzalloc by kcalloc
GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes
Geert Uytterhoeven (1):
GFS2: memcontrol: Spelling s/invlidate/invalidate/
Steven Whitehouse (2):
GFS2: Fix race in glock lru glock disposal
GFS2: Use GFP_NOFS when allocating glocks
fs/gfs2/file.c | 4 ++--
fs/gfs2/glock.c | 14 +++++++++-----
fs/gfs2/glops.c | 4 ++--
fs/gfs2/lock_dlm.c | 4 ++--
fs/gfs2/rgrp.c | 4 ++--
5 files changed, 17 insertions(+), 13 deletions(-)