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
| ||
|
Date: Wed, 29 Mar 2017 11:54:57 +0200 From: Juergen Gross <jgross@...e.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Ingo Molnar <mingo@...nel.org>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, Stefano Stabellini <sstabellini@...nel.org>, Boris Ostrovsky <boris.ostrovsky@...cle.com>, Xen Devel <Xen-devel@...ts.xensource.com>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Vitaly Kuznetsov <vkuznets@...hat.com>, Andy Lutomirski <luto@...nel.org>, Mathias Krause <minipli@...glemail.com>, Thomas Garnier <thgarnie@...gle.com> Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree On 29/03/17 10:59, Ingo Molnar wrote: > > * Juergen Gross <jgross@...e.com> wrote: > >> On 29/03/17 05:35, Stephen Rothwell wrote: >>> Hi all, >>> >>> Today's linux-next merge of the xen-tip tree got a conflict in: >>> >>> arch/x86/xen/enlighten.c >>> >>> between commits: >>> >>> 6415813bae75 ("x86/cpu: Drop wp_works_ok member of struct cpuinfo_x86") >>> 69218e47994d ("x86: Remap GDT tables in the fixmap section") >>> b23adb7d3f7d ("x86/xen/gdt: Use X86_FEATURE_XENPV instead of globals for the GDT fixup") >>> >>> from the tip tree and commits: >>> >>> 75cd32d6093e ("x86/xen: split off enlighten_pv.c") >>> >>> from the xen-tip tree. >>> >>> I dropped the xen-tip tree for today (see other conflict reports), >>> please get together and sort these out, thanks. Stephen, I have rewound the linux-next branch of xen-tip to its previous position. You can re-enable xen-tip. Juergen
Powered by blists - more mailing lists