Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

linux-next: manual merge of the omap_dss2 tree with the omap tree

0 views
Skip to first unread message

Stephen Rothwell

unread,
Mar 10, 2010, 11:20:01 PM3/10/10
to
Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/vram.c between commit
4ff6baf45cd23593592e5786ccd607bdc8785f4c ("omap: Fix compile for
early_param and omap_smc1") from the omap tree and commit
5c1f96f4cffbdde9e194f3ae5373953f3fa12836 ("OMAP: DSS2: VRAM: Fix
early_param for vram") from the omap_dss2 tree.

Just two versions of the same fix to omap_vram_early_vram(). I used the
omap tree version.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Tony Lindgren

unread,
Mar 11, 2010, 12:00:02 PM3/11/10
to
* Stephen Rothwell <s...@canb.auug.org.au> [100310 20:15]:

> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/vram.c between commit
> 4ff6baf45cd23593592e5786ccd607bdc8785f4c ("omap: Fix compile for
> early_param and omap_smc1") from the omap tree and commit
> 5c1f96f4cffbdde9e194f3ae5373953f3fa12836 ("OMAP: DSS2: VRAM: Fix
> early_param for vram") from the omap_dss2 tree.
>
> Just two versions of the same fix to omap_vram_early_vram(). I used the
> omap tree version.

I'll split my patch in two parts, and let Tomi queue this fix.

Regards,

Tony
--
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

unread,
Mar 11, 2010, 5:20:02 PM3/11/10
to
Hi Tony,

On Thu, 11 Mar 2010 08:53:59 -0800 Tony Lindgren <to...@atomide.com> wrote:
>
> I'll split my patch in two parts, and let Tomi queue this fix.

OK, thanks.

0 new messages