Merge two commits from 'kvm-ppc-fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 13 Mar 2018 04:08:41 +0000 (15:08 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 13 Mar 2018 04:08:41 +0000 (15:08 +1100)
commit2852aab819574fbcd9fa2cba8a263479506c5f70
tree7c60bb4b5ae744891daa4dfc487fff658c23870c
parent4bd13772eeb2b9989789e8dbc183026867168db4
parent6df3877fc962c2bb3d0438633dfd24a185af6838
Merge two commits from 'kvm-ppc-fixes' into next

This merges two commits from the `kvm-ppc-fixes` branch into next, as
they fix build breaks we are seeing while testing next.