From: Tony Lindgren <tony@atomide.com>
To: Komal Shah <komal_shah802003@yahoo.com>
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: omap git tree inconsistency
Date: Fri, 7 Apr 2006 13:43:59 -0700 [thread overview]
Message-ID: <20060407204358.GL21950@atomide.com> (raw)
In-Reply-To: <20060407202321.12537.qmail@web32907.mail.mud.yahoo.com>
* 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
next prev parent reply other threads:[~2006-04-07 20:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-07 20:23 omap git tree inconsistency Komal Shah
2006-04-07 20:43 ` Tony Lindgren [this message]
2006-04-08 15:32 ` Komal Shah
2006-04-09 18:18 ` tony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060407204358.GL21950@atomide.com \
--to=tony@atomide.com \
--cc=komal_shah802003@yahoo.com \
--cc=linux-omap-open-source@linux.omap.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.