From: Linus Torvalds Date: Mon, 19 Aug 2013 16:30:12 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes X-Git-Tag: accepted/tizen/common/20141203.182822~1680 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6a5e06cd17a3f901231e345e4acc1c3dab9fbb8;p=platform%2Fkernel%2Flinux-arm64.git Merge git://git./linux/kernel/git/steve/gfs2-3.0-fixes Pull gfs2 fixes from Steven Whitehouse: "Out of these five patches, the one for ensuring that the number of revokes is not exceeded, and the one for checking the glock is not already held in gfs2_getxattr are the two most important. The latter can be triggered by selinux. The other three patches are very small and fix mostly fairly trivial issues" * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Check for glock already held in gfs2_getxattr GFS2: alloc_workqueue() doesn't return an ERR_PTR GFS2: don't overrun reserved revokes GFS2: WQ_NON_REENTRANT is meaningless and going away GFS2: Fix typo in gfs2_create_inode() --- d6a5e06cd17a3f901231e345e4acc1c3dab9fbb8