Thread (6 messages) 6 messages, 4 authors, 2011-07-21

conflicts between omap/cleanup branch and omap_dss2 tree

From: arnd@arndb.de (Arnd Bergmann)
Date: 2011-07-19 12:59:44
Also in: linux-omap

On Tuesday 19 July 2011, Archit Taneja wrote:
Tomi is on vacation right now, but he checks his mail once in a while, 
so we may get a response soon.

Tomi's for-next branch is not up to date yet. So it shouldn't be 
considered for now. The HWMOD patches in Tomi's for-next branch will be 
pushed by Paul as 3.1-rc fixes.

We will make a temporary branch which will contain all the DSS2 patches 
which Tomi intended to push for this merge window, once he gets a 
chance, he can quickly update his for-next branch with it.
Ok, just let me know when you upload that branch so I can remove the
dependency from the arm-soc tree. Right now, I'm pulling the
omap_dss2/for_next branch into arm-soc/for_next as a dependency
to resolve the conflict.

	Arnd
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help