Merge branch 'fixes' into next

We have some dependencies & conflicts between patches in fixes and
things to go in next, both in the radix TLB flush code and the IMC PMU
driver. So merge fixes into next.

diff --cc arch/powerpc/kernel/dt_cpu_ftrs.c
Simple merge

diff --cc arch/powerpc/kernel/kprobes.c
Simple merge

diff --cc arch/powerpc/kernel/mce_power.c
Simple merge

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge

diff --cc arch/powerpc/kernel/trace/ftrace_64_mprofile.S
Simple merge

diff --cc arch/powerpc/lib/sstep.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/setup.c
Simple merge