* linux-next: build failure after merge of the pcmcia tree
@ 2010-03-11 2:21 Stephen Rothwell
2010-03-11 8:17 ` Dominik Brodowski
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-03-11 2:21 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the pcmcia tree
2010-03-11 2:21 linux-next: build failure after merge of the pcmcia tree Stephen Rothwell
@ 2010-03-11 8:17 ` Dominik Brodowski
2010-03-11 10:32 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Dominik Brodowski @ 2010-03-11 8:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-11 10:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-11 2:21 linux-next: build failure after merge of the pcmcia tree Stephen Rothwell
2010-03-11 8:17 ` Dominik Brodowski
2010-03-11 10:32 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®