Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 1 Jul 2019 04:04:39 +0000 (14:04 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 1 Jul 2019 04:04:39 +0000 (14:04 +1000)
commit8b8dc695143642c6a8bee2242f2f7af4232298ab
treec36e89fcf8594e923f14016dc33f12736fd0f5af
parent3c25ab35fbc8526ac0c9b298e8a78e7ad7a55479
parentb7cbb5240130520ba572ab1146431ad01d1f5099
Merge branch 'fixes' into next

Merge our fixes branch into next, this brings in a number of commits
that fix bugs we don't want to hit in next, in particular the fix for
CVE-2019-12817.
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/prom_init.c
arch/powerpc/mm/book3s64/pgtable.c