From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>,
linux-arm-kernel@lists.infradead.org,
linux-omap <linux-omap@vger.kernel.org>,
arm@kernel.org, Russell King - ARM Linux <linux@arm.linux.org.uk>
Subject: Re: OMAP build now completely broken in latest arm-soc
Date: Mon, 26 Nov 2012 10:30:03 +0200 [thread overview]
Message-ID: <50B3288B.2080609@ti.com> (raw)
In-Reply-To: <CAOesGMiv374Bhpt=Hu5o7E+eUGhX8R4w=1DLgxzzE6ieRUva=w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]
On 2012-11-26 08:00, Olof Johansson wrote:
> Tony, Tomi,
>
> I've taken a stab at resolving these conflicts. They seem to come from
> the cleanups combined with fixes that went upstream, and it seems like
> we want to stick to the arm-soc versions for most of the conflicts.
>
> I've pushed a merge of 3.7-rc7 into next/cleanup (and for-next) of
> arm-soc, can you please check and see if this is the correct
> resolution? As far as I can tell it is, but a double-check would be
> appreciated.
>
> Conflicts were in:
>
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> arch/arm/plat-omap/i2c.c
> drivers/video/omap2/dss/dss.c
>
> The hwmod data was trivial (include files). i2c was a little hairier,
> a revert in mainline -- I presumed we're still good with our arm-soc
> contents so I stuck close to what we had there. The DSS change seems
> to be done completely differently in mainline, i.e. the surrounding
> code is different to what we have in arm-soc today, and it looks like
> the bugfix (3630-specific stuff) is taken care of in the version we
> had. So I stuck to that.
>
> But, please speak up ASAP if the above doesn't look correct, since we
> want to fix it up before we merge much on top.
The dss.c is resolved correctly.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: tomi.valkeinen@ti.com (Tomi Valkeinen)
To: linux-arm-kernel@lists.infradead.org
Subject: OMAP build now completely broken in latest arm-soc
Date: Mon, 26 Nov 2012 10:30:03 +0200 [thread overview]
Message-ID: <50B3288B.2080609@ti.com> (raw)
In-Reply-To: <CAOesGMiv374Bhpt=Hu5o7E+eUGhX8R4w=1DLgxzzE6ieRUva=w@mail.gmail.com>
On 2012-11-26 08:00, Olof Johansson wrote:
> Tony, Tomi,
>
> I've taken a stab at resolving these conflicts. They seem to come from
> the cleanups combined with fixes that went upstream, and it seems like
> we want to stick to the arm-soc versions for most of the conflicts.
>
> I've pushed a merge of 3.7-rc7 into next/cleanup (and for-next) of
> arm-soc, can you please check and see if this is the correct
> resolution? As far as I can tell it is, but a double-check would be
> appreciated.
>
> Conflicts were in:
>
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> arch/arm/plat-omap/i2c.c
> drivers/video/omap2/dss/dss.c
>
> The hwmod data was trivial (include files). i2c was a little hairier,
> a revert in mainline -- I presumed we're still good with our arm-soc
> contents so I stuck close to what we had there. The DSS change seems
> to be done completely differently in mainline, i.e. the surrounding
> code is different to what we have in arm-soc today, and it looks like
> the bugfix (3630-specific stuff) is taken care of in the version we
> had. So I stuck to that.
>
> But, please speak up ASAP if the above doesn't look correct, since we
> want to fix it up before we merge much on top.
The dss.c is resolved correctly.
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121126/d14b7842/attachment.sig>
next prev parent reply other threads:[~2012-11-26 8:30 UTC|newest]
Thread overview: 14+ 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 9:37 ` Russell King - ARM Linux
2012-11-25 13:56 ` Olof Johansson
2012-11-25 13:56 ` Olof Johansson
2012-11-25 14:07 ` Russell King - ARM Linux
2012-11-25 14:07 ` Russell King - ARM Linux
2012-11-26 6:00 ` Olof Johansson
2012-11-26 6:00 ` Olof Johansson
2012-11-26 8:30 ` Tomi Valkeinen [this message]
2012-11-26 8:30 ` Tomi Valkeinen
2012-11-26 17:37 ` Tony Lindgren
2012-11-26 17:37 ` Tony Lindgren
2012-11-27 1:13 ` 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=50B3288B.2080609@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.