linux-kernel - Re: More breakage in native_rdtsc out of line in git-x86

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] [day] [month] [year] [list]

Message-ID: <aa79d98a0801102121h785dabc1y1d8982994d024eff@mail.gmail.com>
Date:	Fri, 11 Jan 2008 08:21:55 +0300
From:	"Cyrill Gorcunov" <gorcunov@...il.com>
To:	"Paolo Ciarrocchi" <paolo.ciarrocchi@...il.com>
Cc:	"Andi Kleen" <andi@...stfloor.org>,
	"Harvey Harrison" <harvey.harrison@...il.com>,
	"Björn Steinbrink" <B.Steinbrink@....de>,
	"Ingo Molnar" <mingo@...e.hu>, tglx@...utronix.de,
	linux-kernel@...r.kernel.org, "H. Peter Anvin" <hpa@...or.com>
Subject: Re: More breakage in native_rdtsc out of line in git-x86

On Jan 10, 2008 2:37 AM, Paolo Ciarrocchi <paolo.ciarrocchi@...il.com> wrote:
> On 1/10/08, Andi Kleen <andi@...stfloor.org> wrote:
>
> > I'm already cloning the branches; the problem is not getting conflicts etc.
> > when updating.
>
> Isn't git pull --force what you are looking for?
>
> Ciao,
> --
> Paolo
> http://paolo.ciarrocchi.googlepages.com/
>

Actually...no, it wouldn't help. Conflicts will coming up and only
the solution for now is to use remote tracking as Harvey wrote
in prev mail. (btw, git pull that would not conflict is when it
called with '-s ours' but that is not good)

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