lkml.org 
[lkml]   [2008]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT pull] x86 updates

* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Tue, 15 Jul 2008, Thomas Gleixner wrote:
> >
> > http://git.kernel.org/?p=linux/kernel/git/tip/linux-2.6-tip.git;a=shortlog;h=x86/urgent
> >
> > has a commit on top of your tree.
> >
> > commit 431ceb83f703a343bdd14350480a2224fa4bfedf
> > tree 2f4644aec0d326e23327ed2297a4a4f52b1d830e
> > parent b9d2252c1e44fa83a4e65fdc9eb93db6297c55af
> >
> > I waited with the pull request until it showed up there.
>
> I'd say it's a mirroring issue, but:
>
> [torvalds@woody linux]$ git ls-remote ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git | grep x86/urgent
> b9d2252c1e44fa83a4e65fdc9eb93db6297c55af refs/heads/x86/urgent
> b9d2252c1e44fa83a4e65fdc9eb93db6297c55af refs/heads/x86/urgent-undo-ioapic
> 41b7aafd3ea22fcd6cbb062da39d5c757d6c09ca refs/remotes/origin/x86/urgent
>
> ie it looks like even master has b9d2252c1 as tip (which is the one
> you say is the parent).
>
> I wonder if Ingo overwrote it. You both push to the same tree, don't
> you? And maybe somebody used "-f" to force an over-push?

sorry, my fault - i have reset it back to -git because i wanted to get
rid of the local merge commit that we created over
include/asm-x86/dwarf2.h. That coincided with Thomas pushing an urgent
fix out. We rarely push out via -f but this was an exception.

Thomas, could you please push it again?

Ingo


\
 
 \ /
  Last update: 2008-07-16 00:09    [from the cache]
©2003-2011 Jasper Spaans