From: Linus Torvalds Date: Thu, 3 Jan 2013 19:38:14 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes X-Git-Tag: v3.8-rc3~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed4e6a94d3053b9900b4a1338b8056d532a564c4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge git://git./linux/kernel/git/steve/gfs2-3.0-fixes Pull GFS2 fixes from Steven Whitehouse: "Here are four small bug fixes for GFS2. There is no common theme here really, just a few items that were fixed recently. The first fixes lock name generation when the glock number is 0. The second fixes a race allocating reservation structures and the final two fix a performance issue by making small changes in the allocation code." * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Reset rd_last_alloc when it reaches the end of the rgrp GFS2: Stop looking for free blocks at end of rgrp GFS2: Fix race in gfs2_rs_alloc GFS2: Initialize hex string to '0' --- ed4e6a94d3053b9900b4a1338b8056d532a564c4