Merge branch 'fixes' into next

Bring in our fixes branch for this cycle which avoids some small
conflicts with upcoming commits.

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

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

diff --cc arch/powerpc/perf/imc-pmu.c
Simple merge