From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2013 20:06:20 +0000 (-0700)
Subject: Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.10-rc1~32
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=8769e078a9a2bce13d39c08e0e5a513f5320e1de

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

Pull xfs update (#2) from Ben Myers:

 - add CONFIG_XFS_WARN, a step between zero debugging and
   CONFIG_XFS_DEBUG.

 - fix attrmulti and attrlist to fall back to vmalloc when kmalloc
   fails.

* tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs:
  xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle
  xfs: fallback to vmalloc for large buffers in xfs_attrlist_by_handle
  xfs: introduce CONFIG_XFS_WARN
---

8769e078a9a2bce13d39c08e0e5a513f5320e1de