Hi folks, I just rebased the for-next branch of the XFS tree to fix the complaints about mismatched author/sob information in a couple of the commits I pushed last week. There is no change of the code in the tree, just commit metadata was modified. The rebased commits are listed below. -Dave. ---------------------------------------------------------------- git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next ---------------------------------------------------------------- Head commit: e033f40be262c4d227f8fbde52856e1d8646872b xfs: on memory failure, only shut down fs after scanning all mappings ---------------------------------------------------------------- Darrick J. Wong (1): xfs: on memory failure, only shut down fs after scanning all mappings Shida Zhang (2): xfs: trim the mapp array accordingly in xfs_da_grow_inode_int xfs: rearrange the logic and remove the broken comment for xfs_dir2_isxx fs/xfs/libxfs/xfs_da_btree.c | 2 +- fs/xfs/libxfs/xfs_dir2.c | 50 ++++++++++++++++++++++++++++++-------------------- fs/xfs/libxfs/xfs_dir2.h | 4 ++-- fs/xfs/scrub/dir.c | 2 +- fs/xfs/xfs_dir2_readdir.c | 2 +- fs/xfs/xfs_notify_failure.c | 26 +++++++++++++++++--------- 6 files changed, 52 insertions(+), 34 deletions(-) -- Dave Chinner david@xxxxxxxxxxxxx