Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

On Mon, Apr 13, 2015 at 05:55:31PM +1000, Stephen Rothwell wrote: >Hi, > >On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang wrote: >> >> Hi, Stephen, >> >> Thanks for your finding :-) Your fix looks good to me. >> >> Michael & Ben, >> >> Do I need to rebase the patch or what should I do? > >You shoul

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

Hi, On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang wrote: > > Hi, Stephen, > > Thanks for your finding :-) Your fix looks good to me. > > Michael & Ben, > > Do I need to rebase the patch or what should I do? You should have nothing to do, Michael has fixed it up when he merged Ben's tree into hi

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

On Mon, Apr 13, 2015 at 01:27:15PM +1000, Stephen Rothwell wrote: >Hi all, > >Today's linux-next merge of the powerpc-mpe tree got a conflict in >arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9 >("powerpc/powernv: Reserve additional space for IOV BAR according to >the number of total

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

Hi all, Today's linux-next merge of the powerpc-mpe tree got a conflict in arch/powerpc/platforms/powernv/pci-ioda.c between commit 6e628c7d33d9 ("powerpc/powernv: Reserve additional space for IOV BAR according to the number of total_pe") from the powerpc tree and commit 65ebf4b6370e ("powerpc/pow

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

Hi all, Today's linux-next merge of the powerpc-mpe tree got a conflict in arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9 ("powerpc/powernv: Reserve additional space for IOV BAR according to the number of total_pe") from the tree and commit 467efc2e4fdc ("powerpc: Remove shims for