From: Linus Torvalds Date: Fri, 31 May 2013 21:50:16 +0000 (+0900) Subject: Merge tag 'for-linus-v3.10-rc4' of git://oss.sgi.com/xfs/xfs X-Git-Tag: v3.10-rc4~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8d256aca05b6de163605a04f86e5827ef77899f;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'for-linus-v3.10-rc4' of git://oss.sgi.com/xfs/xfs Pull xfs fixes from Ben Myers: - Fix nested transactions in xfs_qm_scall_setqlim - Clear suid/sgid bits when we truncate with size update - Fix recovery for split buffers - Fix block count on remote symlinks - Add fsgeom flag for v5 superblock support - Disable XFS_IOC_SWAPEXT for CRC enabled filesystems - Fix dirv3 freespace block corruption * tag 'for-linus-v3.10-rc4' of git://oss.sgi.com/xfs/xfs: xfs: fix dir3 freespace block corruption xfs: disable swap extents ioctl on CRC enabled filesystems xfs: add fsgeom flag for v5 superblock support. xfs: fix incorrect remote symlink block count xfs: fix split buffer vector log recovery support xfs: kill suid/sgid through the truncate path. xfs: avoid nesting transactions in xfs_qm_scall_setqlim() --- e8d256aca05b6de163605a04f86e5827ef77899f