From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Jun 2013 05:16:31 +0000 (-1000)
Subject: Merge tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: accepted/tizen/common/20141203.182822~2070
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d58c6ff0b779c5adae2a8596fde69cb45f2a5d68;p=platform%2Fkernel%2Flinux-arm64.git

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

Pull xfs fixes from Ben Myers:
 - Remove noisy warnings about experimental support which spams the logs
 - Add padding to align directory and attr structures correctly
 - Set block number on child buffer on a root btree split
 - Disable verifiers during log recovery for non-CRC filesystems

* tag 'for-linus-v3.10-rc6' of git://oss.sgi.com/xfs/xfs:
  xfs: don't shutdown log recovery on validation errors
  xfs: ensure btree root split sets blkno correctly
  xfs: fix implicit padding in directory and attr CRC formats
  xfs: don't emit v5 superblock warnings on write
---

d58c6ff0b779c5adae2a8596fde69cb45f2a5d68