From: 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: Sun, 9 Apr 2006 11:18:51 -0700 [thread overview]
Message-ID: <20060409181849.GE5032@atomide.com> (raw)
In-Reply-To: <20060408153234.54204.qmail@web32901.mail.mud.yahoo.com>
* 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
prev parent reply other threads:[~2006-04-09 18:18 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
2006-04-08 15:32 ` Komal Shah
2006-04-09 18:18 ` tony [this message]
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=20060409181849.GE5032@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox