linux-kernel - Re: [GIT pull] x86 updates

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.1.10.0807151456490.2867@woody.linux-foundation.org>
Date:	Tue, 15 Jul 2008 15:00:22 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Thomas Gleixner <tglx@...utronix.de>
cc:	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...e.hu>
Subject: Re: [GIT pull] x86 updates



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@...dy 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?

			Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/