Skip to contentSkip to conversation

omap git tree inconsistency

DISCUSSION Komal Shah 2 participants 4 messages Apr 7, 2006 – Apr 9, 2006

lore
Share & tools
lore

Komal Shah

author
#0 lore raw

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
http://mail.yahoo.com

#1 lore raw
Quoted 9 lines · Komal Shah

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

author
#2 lore raw
Quoted 3 lines · --- Tony Lindgren

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

Not complete yet !. Check drivers/i2c/chips in our tree and you will find x1205.c driver, which is not present in the linus tree, as it was moved to new rtc subsystem folder with new name rtc-x1205.c. So I believe there will more locations like this...:)

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

__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com

#3 lore raw
Quoted 10 lines · Komal Shah
Quoted 3 lines · --- Tony Lindgren

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

Not complete yet !. Check drivers/i2c/chips in our tree and you will find x1205.c driver, which is not present in the linus tree, as it was moved to new rtc subsystem folder with new name rtc-x1205.c. So I believe there will more locations like this...:)

This seemed to be only on source.mvista.com tree for some reason. Running git diff showed some unmerged changes. No idea how that has happened, maybe an interrupted push or something.

In any case, I re-cloned the tree and that seems to have taken care of it.

BTW, I may not have net access until Thursday.

Tony