Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 14 Sep 2020 12:57:18 +0000 (22:57 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 14 Sep 2020 12:57:18 +0000 (22:57 +1000)
commit960e3708135ac8b03ef3d1fa773e369cfacc76b9
tree3b3b679d211377a291a55fb9598d1c7f408aeab9
parentdc462267d2d7aacffc3c1d99b02d7a7c59db7c66
parent0460534b532e5518c657c7d6492b9337d975eaa3
Merge branch 'fixes' into next

Bring in our fixes branch for this cycle which avoids some small
conflicts with upcoming commits.
arch/powerpc/kernel/process.c
arch/powerpc/mm/init_64.c
arch/powerpc/perf/imc-pmu.c