Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Mar 2018 11:59:50 +0000 (22:59 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Mar 2018 11:59:50 +0000 (22:59 +1100)
commit95dff480bb7b7b5ea534ebf00a18ff57eb897669
tree4e7444555649b133c663b43190bc9d2bea4e1712
parentc0b346729b5dd3c7d0232f043f5b15947ffc7978
parent52396500f97c53860164debc7d4f759077853423
Merge branch 'fixes' into next

Merge our fixes branch from the 4.16 cycle.

There were a number of important fixes merged, in particular some Power9
workarounds that we want in next for testing purposes. There's also been
some conflicting changes in the CPU features code which are best merged
and tested before going upstream.
arch/powerpc/include/asm/book3s/64/mmu.h
arch/powerpc/include/asm/cputable.h
arch/powerpc/kernel/dt_cpu_ftrs.c
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/prom_init.c
arch/powerpc/mm/hash_native_64.c
arch/powerpc/mm/mmu_context_book3s64.c
arch/powerpc/mm/tlb-radix.c
tools/testing/selftests/powerpc/tm/Makefile