On Sat, Jun 16, 2012 at 2:50 AM, Sebastian Andrzej Siewior <sebastian@xxxxxxxxxxxxx> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > On Fri, Jun 15, 2012 at 03:13:26PM -0600, Bjorn Helgaas wrote: >> On Fri, Jun 15, 2012 at 10:38 AM, Ralf Baechle <ralf@xxxxxxxxxxxxxx> wrote: >> > On Fri, Jun 15, 2012 at 10:33:15AM -0600, Bjorn Helgaas wrote: >> > >> >> > Doesn't the above line also need changed to __devinitdata if the >> >> > function itself is being >> >> > changed from __init to __devinit? >> >> >> >> I think so. And pci_irq[] and piixirqmap[] also need to be moved, >> >> since they're referenced by __devinit code. I fixed these, audited >> >> all the other patches, and updated the "next" branch. >> > >> > I'm going to patch that up. >> >> Does this mean you're going to push it through your tree and I should >> remove the mips patch from my "next" branch? Either way is fine with >> me; currently I'm planning to push all the other arch patches via my >> tree. > > Ralf picked up my patch [0] and commited a few fixups on top [1] and a malta > fixup [2]. > > [0] http://git.linux-mips.org/?p=ralf/linux.git;a=commitdiff;h=184170a613f4bccf4d58a4e73fa5d3a1ee839f38 > [1] http://git.linux-mips.org/?p=ralf/linux.git;a=commitdiff;h=f54d03696bdc1a9457c11ed6ae61e8f001217b25 > [2] http://git.linux-mips.org/?p=ralf/linux.git;a=commitdiff;h=2ec8663f9c03a96f2c328c7c483603c31d62ad37 OK, I'll drop the MIPS patch from my branch. Note that the three patches you mention above don't yet include the pci_irq[] and piixirqmap[] fixes. I assume you'll include those, too, Ralf. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html