From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: OMAP build now completely broken in latest arm-soc
Date: Sun, 25 Nov 2012 14:07:01 +0000 [thread overview]
Message-ID: <20121125140701.GW3332@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <CAOesGMgvGxfghFbyki7aXE8dVbAA7QQP6nwBKhzHftngGRi0Tw@mail.gmail.com>
On Sun, Nov 25, 2012 at 05:56:58AM -0800, Olof Johansson wrote:
> Hi,
>
> On Sun, Nov 25, 2012 at 1:37 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > Not much more to say...
> >
> > arch/arm/plat-omap/i2c.c:35:1: error: expected identifier or '(' before '<<' token
>
> Hmm. In for-next, line 35 is a blank line.
>
> Could this be because of a merge conflict in your local version? This
> is one of the files that has conflicts with mainline right now; I'll
> look to see if we can resolve those in our tree later today.
Hmm, it looks like a merge conflict which didn't get fixed up... and
looking at it, it's beyond what I'd call trivial to fix.
So I'll shut down the build system until that can be resolved properly;
as OMAP is effectively unbuildable there's not much point it running the
builds.
next prev parent reply other threads:[~2012-11-25 14:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-25 9:37 OMAP build now completely broken in latest arm-soc Russell King - ARM Linux
2012-11-25 13:56 ` Olof Johansson
2012-11-25 14:07 ` Russell King - ARM Linux [this message]
2012-11-26 6:00 ` Olof Johansson
2012-11-26 8:30 ` Tomi Valkeinen
2012-11-26 17:37 ` Tony Lindgren
2012-11-27 1:13 ` Tony Lindgren
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=20121125140701.GW3332@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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