On Mon, Jul 23, 2012 at 9:21 PM, Benjamin Herrenschmidt <b...@kernel.crashing.org> wrote: > On Mon, 2012-07-23 at 16:32 -0600, Grant Likely wrote: >> > As-is I'm backing off from the linear/legacy/tree merge patch as just >> > too risky. I've already pulled that stuff out of linux-next. >> >> Can I pull you pseries fix into my tree (my preference), or do I need >> to rebase on top of yours? > > The mpic fix for the g5 is in Linus tree already, I added it on top of > powerpc -next before I asked Linus to pull. > > For pseries (ie the fix for irq_find_mapping vs. radix), I don't have a > formal patch, just the one I hand typed in my previous email, so do > whatever you want with it.
Okay, I'll merge in Linus' tree at the appropriate point to protect against bisection, and I'll fix up the appropriate patch that touches irq_find_mapping. g. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
