linux-next: manual merge of the akpm-current tree with the tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/btrfs/inode.cfs/btrfs/file.c between commit 55e301fd57a6 ("Btrfs: move
fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h") from the btrfs tree and
commit "aio: don't include aio.h in sched.h" from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/btrfs/file.c
index 8614c5b,39f556f..0000000
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@@ -30,7 -30,7 +30,8 @@@
  #include <linux/statfs.h>
  #include <linux/compat.h>
  #include <linux/slab.h>
 +#include <linux/btrfs.h>
+ #include <linux/aio.h>
  #include "ctree.h"
  #include "disk-io.h"
  #include "transaction.h"
diff --cc fs/btrfs/inode.c
index 40d49da,ed7ea0a..0000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -39,8 -39,7 +39,9 @@@
  #include <linux/slab.h>
  #include <linux/ratelimit.h>
  #include <linux/mount.h>
 +#include <linux/btrfs.h>
 +#include <linux/blkdev.h>
+ #include <linux/aio.h>
  #include "compat.h"
  #include "ctree.h"
  #include "disk-io.h"

Attachment: pgp00000.pgp
Description: PGP signature