Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 23 Aug 2017 12:20:10 +0000 (22:20 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 23 Aug 2017 12:20:10 +0000 (22:20 +1000)
commit15c659ff9d5b367c886166a9854a89b72c524a68
treed33acaf62889bf6304f6109dd69923a17ab938be
parent516fa8d0e19d854253460ea7692551e836e7e2b5
parent1a92a80ad386a1a6e3b36d576d52a1a456394b70
Merge branch 'fixes' into next

There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.
16 files changed:
arch/powerpc/Makefile
arch/powerpc/boot/Makefile
arch/powerpc/include/asm/book3s/64/mmu.h
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/include/asm/mmu_context.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/idle_book3s.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/process.c
arch/powerpc/kernel/watchdog.c
arch/powerpc/mm/mmu_context_book3s64.c
arch/powerpc/mm/pgtable-radix.c
arch/powerpc/mm/tlb-radix.c
arch/powerpc/platforms/powernv/idle.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/pseries/reconfig.c