linux-next: build failure after merge of the pcmcia tree

[Stephen Rothwell]

Hi Dominik,

After merging the pcmcia tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/pcmcia/pcmcia_resource.c:704:1: error: unterminated #ifdef

Caused by commit 484f4b3fdd8f3de102b07a9b6d0d72342bcc1590 ("pcmcia:
revert "irq probe can be done without risking an IRQ storm"") which has
conflict resolution fragments still in it ...

Please, please, read and build test this stuff ...

I have used the version of the pcmcis tree from next-20100310 for today.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[Dominik Brodowski]

Hey Stephen,

On Thu, Mar 11, 2010 at 01:21:49PM +1100, Stephen Rothwell wrote:
> After merging the pcmcia tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/pcmcia/pcmcia_resource.c:704:1: error: unterminated #ifdef

oops, I'm very sorry, seems like I pushed the wrong tree to master... fixed
it; so should be fine for tomorrow.

Best,
Dominik
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Stephen Rothwell]

Hi Dominik,

On Thu, 11 Mar 2010 09:17:54 +0100 Dominik Brodowski <li...@dominikbrodowski.net> wrote:
>
> oops, I'm very sorry, seems like I pushed the wrong tree to master... fixed
> it; so should be fine for tomorrow.

Thanks.