Merge branch 'fixes' into next

Merge our fixes branch from this cycle. It contains several important
fixes we need in next for testing purposes, and also some that will
conflict with upcoming changes.

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/book3s/32/kup.h
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

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

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge