linux-next: manual merge of the x86 tree

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
arch/x86/kernel/entry_64.S between commits
16444a8a40d4c7b4f6de34af0cae1f76a4f6c901 ("ftrace: add basic support for
gcc profiler instrumentation"), d61f82d06672f57fca410da6f7fffd15867db622
("ftrace: use dynamic patching for updating mcount calls") and
395a59d0f8e86bb39cd700c3d185d30c670bb958 ("ftrace: store mcount address
in rec->ip") from the ftrace tree and commit
5cc8bd8f5d31bc08341deb666cdf2404262fc3e5 ("x86 NMI-safe INT3 and Page
Fault") from the x86 tree.

Just overlapping additions.  I took both and can carry the fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/