linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/udf/file.c between commit 13f0c2b0f67d ("udf: remove redundant
buffer_head.h includes") from the ext3 tree and commit 52858684778b
("fs: move struct kiocb to fs.h") from the vfs 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/udf/file.c
index dda8ea7012c6,7f885cc8b0b7..000000000000
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@@ -33,7 -33,8 +33,7 @@@
  #include <linux/capability.h>
  #include <linux/errno.h>
  #include <linux/pagemap.h>
- #include <linux/aio.h>
 -#include <linux/buffer_head.h>
+ #include <linux/uio.h>
  
  #include "udf_i.h"
  #include "udf_sb.h"

Attachment: pgpIAYvBcy7GY.pgp
Description: OpenPGP digital signature