From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Jan 2013 00:19:54 +0000 (-0800)
Subject: Merge tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.8-rc4~2
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fkernel-video.git;a=commitdiff_plain;h=dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8

Merge tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers:

 - fix(es) for compound buffers

 - fix for dquot soft timer asserts due to overflow of d_blk_softlimit

 - fix for regression in dir v2 code introduced in commit 20f7e9f3726a
   ("xfs: factor dir2 block read operations")

* tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs:
  xfs: recalculate leaf entry pointer after compacting a dir2 block
  xfs: remove int casts from debug dquot soft limit timer asserts
  xfs: fix the multi-segment log buffer format
  xfs: fix segment in xfs_buf_item_format_segment
  xfs: rename bli_format to avoid confusion with bli_formats
  xfs: use b_maps[] for discontiguous buffers
---

dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8