linux-next: manual merge of the vfs tree with Linus' tree

From: Stephen Rothwell
Date: Sun Apr 28 2013 - 21:39:03 EST

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
drivers/firmware/efivars.c between commit 0635eb8a54cf ("Move utf16
functions to kernel core and rename") from Linus' tree and commit
a2162ae42bc4 ("Include missing linux/magic.h inclusions") from the vfs

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/firmware/efivars.c
index f4baa11,0f102601..0000000
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@@ -80,7 -80,7 +80,8 @@@
#include <linux/slab.h>
#include <linux/pstore.h>
#include <linux/ctype.h>
+#include <linux/ucs2_string.h>
+ #include <linux/magic.h>

#include <linux/fs.h>
#include <linux/ramfs.h>

Attachment: pgp00000.pgp
Description: PGP signature