[PATCH] PMFS: Changes to build with kernel 3.10

[Vishal Verma]

On Mon, 2013-10-21 at 16:14 -0600, Vishal Verma wrote:
> Include linux/aio.h in mm/filemap_xip.c and fs/pmfs/inode.c because
> a27bb332c04cec8c4afd7912df0dc7890db27560 removes it from linux/sched.h
> 
> Signed-off-by: Vishal Verma <vishal.l.verma at linux.intel.com>
> ---
>  fs/pmfs/inode.c  |    1 +
>  mm/filemap_xip.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
This set of patches (for both the 3.10 merge and the 3.11 merge) are
changes *after* merging the PMFS tree with (the respective) upstream
tags and resolving merge conflicts.

I couldn't see a direct way to capture the merge conflict resolutions
with format-patch, and this task sounds like more of a pull request from
a tree, than a patch application.

If someone has better ideas on how to send this out, please let me know!

Thanks,
-Vishal