Messages in this thread | | | From | Michael Ellerman <> | Subject | Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree | Date | Fri, 20 Jul 2018 12:34:06 +1000 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > drivers/vfio/vfio_iommu_spapr_tce.c > > between commit: > > 1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize") > > from the powerpc-fixes tree and commit: > > 00a5c58d9499 ("KVM: PPC: Make iommu_table::it_userspace big endian") > > from the powerpc tree.
Thanks.
That has turned into a real mess, with conflicting code in next, fixes and topic/ppc-kvm.
I'll fix it all up before the merge window.
cheers
| |