linux-kernel - Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the format decoding layer for its 3 users"

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

Message-ID: <49BE6027.60805@goop.org>
Date:	Mon, 16 Mar 2009 07:20:23 -0700
From:	Jeremy Fitzhardinge <jeremy@...p.org>
To:	bderzhavets@...oo.com
CC:	Vegard Nossum <vegard.nossum@...il.com>,
	Xen-devel <xen-devel@...ts.xensource.com>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...e.hu>,
	the arch/x86 maintainers <x86@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [Xen-devel] Re: tip.git regression from "vsprintf: unify the
 format decoding layer for its 3 users"

Boris Derzhavets wrote:
> What is the issue status in meantime ?
> git pull reports conflicting merge ./lib/vsprintf.c
> PV DomUs  may be brought up , but cannot be
> shutdown.
>

Do a "git checkout xen/dom0/hackery; git reset --hard 
remotes/xen/xen/dom0/hackery" to rebase your local hackery branch to the 
upstream one.  I did a bit of a history-rewrite to replace the reverts 
with the proper fix.

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