Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 10 Nov 2017 09:55:03 +0000 (20:55 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 10 Nov 2017 09:55:03 +0000 (20:55 +1100)
commita54c61f46e25345e99eec06a402f746fe33febc6
tree23f59fe8702aaf90802cef6f25e76c15211747e1
parent77fad8bfb1d2f8225b05e4ea34457875fcfae37e
parent7ecb37f62fe58e3e4d9b03443b92d213b2c108ce
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.
arch/powerpc/kernel/dt_cpu_ftrs.c
arch/powerpc/kernel/kprobes.c
arch/powerpc/kernel/mce_power.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/trace/ftrace_64_mprofile.S
arch/powerpc/lib/sstep.c
arch/powerpc/mm/numa.c
arch/powerpc/platforms/powernv/setup.c