omap git tree inconsistency

omap git tree inconsistency

[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.

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

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

Re: omap git tree inconsistency

[Tony Lindgren]

* 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

Re: omap git tree inconsistency

[Komal Shah]

--- Tony Lindgren <tony@atomide.com> wrote:

> 
> 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 

Re: omap git tree inconsistency

[tony]

* Komal Shah <komal_shah802003@yahoo.com> [060408 08:32]:
> --- Tony Lindgren <tony@atomide.com> wrote:
> 
> > 
> > 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