]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:06:20 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:06:20 +0000 (13:06 -0700)
commit1aa04ca885fdaf3f057ab58cb4a090b7b59a3389
tree4f63f3e0179a5b0a17f961f86e775393c8cf1732
parente4f9abac8dd8ce2e143e0445f045f6366914cf97
parent649effb9a61885af39bce969858902010f9633eb
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