Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 05:59:06 +0000 (15:59 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Aug 2018 05:59:06 +0000 (15:59 +1000)
commitb3124ec2f9970c7374d34b00843d9791fca66afc
treeae23bfb84d1bf196f7270bc438472d5329aeee92
parentf7a6947cd49b7ff4e03f1b4f7e7b223003d752ca
parentcca19f0b684f4ed6aabf6ad07ae3e15e77bfd78a
Merge branch 'fixes' into next

Merge our fixes branch from the 4.18 cycle to resolve some minor
conflicts.
arch/powerpc/Makefile
arch/powerpc/kernel/idle_book3s.S
arch/powerpc/kvm/book3s_64_vio.c
arch/powerpc/kvm/book3s_64_vio_hv.c
arch/powerpc/xmon/xmon.c
drivers/vfio/vfio_iommu_spapr_tce.c