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

Conflicts:
	fs/xfs/xfs_iops.c

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_block.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_leaf.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_node.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_sf.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_dir2_readdir.c
Simple merge

diff --cc fs/xfs/xfs_export.c
index 0a0a6fa11ce14885addd81a767b7edf46d45ea44,ba545634cc04dfe64b252d6e11c993891e9084f9..5eb4a14e0a0fdc53d45652a3f84b323f040aa2f1
--- 1/fs/xfs/xfs_export.c
--- 2/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@@ -19,8 -19,11 +19,9 @@@
  #include "xfs_format.h"
  #include "xfs_log_format.h"
  #include "xfs_trans_resv.h"
 -#include "xfs_sb.h"
 -#include "xfs_ag.h"
  #include "xfs_mount.h"
  #include "xfs_da_format.h"
+ #include "xfs_da_btree.h"
  #include "xfs_dir2.h"
  #include "xfs_export.h"
  #include "xfs_inode.h"

diff --cc fs/xfs/xfs_icache.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_iomap.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
index f14a3e5e4a0aeb149191e7c17d140f2700c2240e,4b7802aff9ec3de5b4802bf5f6644fd384d3f898..c50311cae1b1c294759841486d328e09a31e83ca
--- 1/fs/xfs/xfs_iops.c
--- 2/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@@ -35,7 -37,8 +35,7 @@@
  #include "xfs_icache.h"
  #include "xfs_symlink.h"
  #include "xfs_da_btree.h"
- #include "xfs_dir2_priv.h"
+ #include "xfs_dir2.h"
 -#include "xfs_dinode.h"
  #include "xfs_trans_space.h"
  
  #include <linux/capability.h>

diff --cc fs/xfs/xfs_itable.c
Simple merge

diff --cc fs/xfs/xfs_log.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
index 75705dd047b5697a2b972523ff067d8c86620346,f7c312fe91fbb6b42737b39a3c3abe328a1a2eef..a5a945fc3bdc700e218c15f3d9511e9d390cba8f
--- 1/fs/xfs/xfs_log_recover.c
--- 2/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@@ -22,9 -22,12 +22,10 @@@
  #include "xfs_log_format.h"
  #include "xfs_trans_resv.h"
  #include "xfs_bit.h"
 -#include "xfs_inum.h"
  #include "xfs_sb.h"
 -#include "xfs_ag.h"
  #include "xfs_mount.h"
  #include "xfs_da_format.h"
+ #include "xfs_da_btree.h"
  #include "xfs_inode.h"
  #include "xfs_trans.h"
  #include "xfs_log.h"

diff --cc fs/xfs/xfs_mount.c
index f51e4629006f4adb9db72e06b10c1fec1c5e3a22,acbb4837abc5696c770df6be9a3c281fc040d406..d3d38836f87fad07b3c815dd33ae234ddf785b03
--- 1/fs/xfs/xfs_mount.c
--- 2/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@@ -22,9 -22,12 +22,10 @@@
  #include "xfs_log_format.h"
  #include "xfs_trans_resv.h"
  #include "xfs_bit.h"
 -#include "xfs_inum.h"
  #include "xfs_sb.h"
 -#include "xfs_ag.h"
  #include "xfs_mount.h"
  #include "xfs_da_format.h"
+ #include "xfs_da_btree.h"
  #include "xfs_inode.h"
  #include "xfs_dir2.h"
  #include "xfs_ialloc.h"

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc fs/xfs/xfs_trans_buf.c
Simple merge