linux-next: manual merge of the tip tree with the tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/mm/fault.c between commit cedf03bd9aa5 ("x86: fix mm/fault.c
build") from Linus' tree and commit fab1167c4698 ("x86, vsyscall: Add
missing <asm/fixmap.h> to arch/x86/mm/fault.c") from the tip tree.

These are both fixing the same problem but differently.  Given the
comments in the latter, I have used its version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au