Re: omap git tree inconsistency

Tony Lindgren
2006-04-07T20:43:59Z

* Komal Shah <komal_shah802003@yahoo.com> [060407 13:23]:
> Tony,
>
> Our tree seems to not properly merged with the mainline. Simple example
> is drivers/mmc/Makefile where ATM91 and SDHCI driver is missing and
> same for drivers/mmc/KConfig. It happened to me, as my test topic
> branch gets synched regularly from linus tree and omap-git and again
> showed lot's of merge conflicts when I pulled from omap-git tree
> yesterday, which in theory should not show any conflicts which I had
> already resolved while merging from linus tree.

Thanks for noting it! I've synced it with the mainline tree.

Tony