Hi,

I've dropped out the patch which shouldn't have made it into the previous
pull request, so this set should be ok now. Apologies for not spotting
that issue sooner,

Steve.

-------------------------------------------------------------------------
There are two patches which fix up a couple of minor issues in the DLM
interface code, a missing error path in gfs2_rs_alloc(), one patch
which fixes a problem during "withdraw" and a fix for discards/FITRIM when
using 4k sector sized devices.

-------------------------------------------------------------------------

The following changes since commit 66ade474237745a57b7e87da9a93c7ec69fd52bb:

  Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2013-04-03 16:15:17 -0700)

are available in the git repository at:

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

Akinobu Mita (1):
      GFS2: use memchr_inv

Bob Peterson (1):
      GFS2: Issue discards in 512b sectors

David Teigland (1):
      GFS2: use kmalloc for lvb bitmap

Steven Whitehouse (1):
      GFS2: Fix unlock of fcntl locks during withdrawn state

Wei Yongjun (1):
      GFS2: return error if malloc failed in gfs2_rs_alloc()

 fs/gfs2/file.c     |    5 ++++-
 fs/gfs2/incore.h   |    1 +
 fs/gfs2/lock_dlm.c |   39 ++++++++++++++++++++-------------------
 fs/gfs2/rgrp.c     |   32 ++++++++++++++------------------
 4 files changed, 39 insertions(+), 38 deletions(-)