From: Dave Chinner <david@fromorbit.com>
Date: Wed, 3 Dec 2014 22:46:17 +0000 (+1100)
Subject: Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6044e4386cd51dece882ea42352cdaaab0f24cad;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Conflicts:
	fs/xfs/xfs_iops.c
---

6044e4386cd51dece882ea42352cdaaab0f24cad
diff --cc fs/xfs/xfs_export.c
index 0a0a6fa11ce1,ba545634cc04..5eb4a14e0a0f
--- a/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_iops.c
index f14a3e5e4a0a,4b7802aff9ec..c50311cae1b1
--- a/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_log_recover.c
index 75705dd047b5,f7c312fe91fb..a5a945fc3bdc
--- a/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 f51e4629006f,acbb4837abc5..d3d38836f87f
--- a/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"