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

From: Tony Lindgren <[email-masked]>
Date: Thu, 11 Mar 2010 08:53:59 -0800

* Stephen Rothwell <[email-masked]> [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