Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux