From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 12 Apr 2015 02:24:41 +0000 (-0400)
Subject: Merge branch 'iocb' into for-next
X-Git-Tag: v4.1-rc1~142^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'iocb' into for-next
---

c0fec3a98bd6c4d992f191ee1aa0b3599213f3d4
diff --cc fs/xfs/xfs_file.c
index a2e1cb8a568bf,f527618cb42b8..f44212fae6532
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@@ -36,9 -36,7 +36,8 @@@
  #include "xfs_trace.h"
  #include "xfs_log.h"
  #include "xfs_icache.h"
 +#include "xfs_pnfs.h"
  
- #include <linux/aio.h>
  #include <linux/dcache.h>
  #include <linux/falloc.h>
  #include <linux/pagevec.h>