public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dominik Brodowski <linux@dominikbrodowski•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: build failure after merge of the pcmcia tree
Date: Thu, 11 Mar 2010 13:21:49 +1100	[thread overview]
Message-ID: <20100311132149.c6ef7616.sfr@canb.auug.org.au> (raw)

[-- 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 --]

             reply	other threads:[~2010-03-11  2:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-11  2:21 Stephen Rothwell [this message]
2010-03-11  8:17 ` linux-next: build failure after merge of the pcmcia tree Dominik Brodowski
2010-03-11 10:32   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100311132149.c6ef7616.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux@dominikbrodowski$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox