Dave Chinner 2b93681f59 Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next ...

Conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/xfs_inode.c

2015-03-25 15:12:30 +11:00

..

xfs_alloc_btree.c

xfs: merge xfs_ag.h into xfs_format.h

2014-11-28 14:25:04 +11:00

xfs_alloc_btree.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_alloc.c

xfs: xfs_alloc_fix_minleft can underflow near ENOSPC

2015-02-24 10:16:04 +11:00

xfs_alloc.h

xfs: merge xfs_ag.h into xfs_format.h

2014-11-28 14:25:04 +11:00

xfs_attr_leaf.c

xfs: consolidate superblock logging functions

2015-01-22 09:10:31 +11:00

xfs_attr_leaf.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_attr_remote.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_attr_remote.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_attr_sf.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_attr.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_bit.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_bmap_btree.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_bmap_btree.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_bmap.c

Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next

2015-03-25 15:12:30 +11:00

xfs_bmap.h

xfs: move xfs_bmap_finish prototype

2015-01-09 10:47:14 +11:00

xfs_btree.c

xfs: pass mp to XFS_WANT_CORRUPTED_RETURN

2015-02-23 22:39:13 +11:00

xfs_btree.h

xfs: require 64-bit sector_t

2014-07-30 09:12:05 +10:00

xfs_cksum.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_da_btree.c

xfs: fix shadow warning in xfs_da3_root_split()

2015-03-25 14:55:25 +11:00

xfs_da_btree.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_da_format.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_da_format.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_dir2_block.c

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

2014-12-04 09:46:17 +11:00

xfs_dir2_data.c

xfs: pass mp to XFS_WANT_CORRUPTED_RETURN

2015-02-23 22:39:13 +11:00

xfs_dir2_leaf.c

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

2014-12-04 09:46:17 +11:00

xfs_dir2_node.c

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

2014-12-04 09:46:17 +11:00

xfs_dir2_priv.h

xfs: move type conversion functions to xfs_dir.h

2014-12-04 09:43:17 +11:00

xfs_dir2_sf.c

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

2014-12-04 09:46:17 +11:00

xfs_dir2.c

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

2014-12-04 09:46:17 +11:00

xfs_dir2.h

xfs: move type conversion functions to xfs_dir.h

2014-12-04 09:43:17 +11:00

xfs_dquot_buf.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_format.h

xfs: remove xfs_mod_incore_sb API

2015-02-23 21:24:37 +11:00

xfs_fs.h

xfs: move xfs_fs.h to libxfs

2015-01-09 10:45:13 +11:00

xfs_ialloc_btree.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_ialloc_btree.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_ialloc.c

Merge branch 'xfs-generic-sb-counters' into for-next

2015-02-24 10:27:28 +11:00

xfs_ialloc.h

xfs: merge xfs_ag.h into xfs_format.h

2014-11-28 14:25:04 +11:00

xfs_inode_buf.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_inode_buf.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_inode_fork.c

xfs: merge xfs_inum.h into xfs_format.h

2014-11-28 14:27:10 +11:00

xfs_inode_fork.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_log_format.h

xfs: merge xfs_dinode.h into xfs_format.h

2014-11-28 14:24:06 +11:00

xfs_log_recover.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_log_rlimit.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_quota_defs.h

xfs: remove XFS_IS_OQUOTA_ON macros

2014-07-24 21:27:16 +10:00

xfs_rtbitmap.c

xfs: move most of xfs_sb.h to xfs_format.h

2014-11-28 14:27:09 +11:00

xfs_sb.c

Merge branch 'xfs-generic-sb-counters' into for-next

2015-02-24 10:27:28 +11:00

xfs_sb.h

xfs: consolidate superblock logging functions

2015-01-22 09:10:31 +11:00

xfs_shared.h

xfs: consolidate superblock logging functions

2015-01-22 09:10:31 +11:00

xfs_symlink_remote.c

xfs: set buf types when converting extent formats

2015-01-22 09:30:06 +11:00

xfs_trans_resv.c

xfs: consolidate superblock logging functions

2015-01-22 09:10:31 +11:00

xfs_trans_resv.h

xfs: consolidate superblock logging functions

2015-01-22 09:10:31 +11:00

xfs_trans_space.h

libxfs: move header files

2014-06-25 14:57:36 +10:00

xfs_types.h

xfs: move xfs_types.h to libxfs

2015-01-09 10:46:31 +11:00