"git@git.tuxist.de:jan.koester/linux.git" did not exist on "c6e970a04bdceb7ef1fdbac6be3bd4cd0a0a02bd"
Merge branch 'topic/ppc-kvm' into next
Merge in some commits we're sharing with the KVM tree. I manually propagated the change from commit d3d4ffaa ("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into pci-ioda-tce.c. Conflicts: arch/powerpc/include/asm/cputable.h arch/powerpc/platforms/powernv/pci-ioda.c arch/powerpc/platforms/powernv/pci.h
Loading
Please sign in to comment