Alex Williamson <alex.william...@redhat.com> writes: > On Tue, 08 Nov 2016 18:54:28 +1100 > Michael Ellerman <m...@ellerman.id.au> wrote: >> Alexey Kardashevskiy <a...@ozlabs.ru> writes: >> > arch/powerpc/include/asm/mmu_context.h | 20 ++-- >> > arch/powerpc/kernel/setup-common.c | 2 +- >> > arch/powerpc/mm/mmu_context_book3s64.c | 6 +- >> > arch/powerpc/mm/mmu_context_iommu.c | 60 ++++------- >> > drivers/vfio/vfio_iommu_spapr_tce.c | 181 >> > ++++++++++++++++++++++----------- >> > 5 files changed, 154 insertions(+), 115 deletions(-) >> >> Alex, given the diffstat how do you want to merge this? (for 4.10) >> >> Should I merge it, you merge it, or I can put it in a topic branch? > > I have an outstanding question on one patch, but otherwise I'd prefer > you merge it, I'm not expecting to have anything that would conflict > with vfio_iommu_spapr_tce.c and this code is tied pretty tightly with > arch code. I'll provide acks depending on how we resolve my question.
Great, thanks. cheers
