# Re: \[GIT PULL\] OMAP DSS changes for .38 merge window

- From: Tomi Valkeinen \<hidden\>
- Date: 2011-01-07 14:06:56 
- List: linux-fbdev
- Page: https://ratatoskr.run/linux-fbdev/2011/01/13461044
- Thread: https://ratatoskr.run/linux-fbdev/2011/01/13461040/t.md

```text
On Fri, 2011-01-07 at 22:52 +0900, ext Paul Mundt wrote:

> Hmm, I've just fast-forwarded to Linus's current tree and tried to pull
> your rebase branch in, but it seems to have a board conflict with the
> OMAP tree merge:
> 
> CONFLICT (delete/modify): arch/arm/mach-omap2/board-zoom2.c deleted in HEAD and modified in 122ffebf2191529153c079b457e38ca3829eac40. Version 122ffebf2191529153c079b457e38ca3829eac40 of arch/arm/mach-omap2/board-zoom2.c left in tree.
> 
> Additionally there's a board-zoom.c conflict that looks like this:

Ah. I'll have to fix that. Let's leave this until Monday, as I don't
have a board here to test the fixes.

 Tomi


```