omap git tree inconsistency

Komal Shah
2006-04-07T20:23:21Z

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.

---Komal Shah
http://komalshah.blogspot.com/

__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around