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: Thu, 31 Aug 2017 16:03:42 +0200 From: Juergen Gross <jgross@...e.com> To: Boris Ostrovsky <boris.ostrovsky@...cle.com>, Thomas Gleixner <tglx@...utronix.de> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, Stefano Stabellini <sstabellini@...nel.org>, Xen Devel <Xen-devel@...ts.xensource.com>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree On 31/08/17 16:01, Boris Ostrovsky wrote: > On 08/31/2017 08:00 AM, Thomas Gleixner wrote: >> On Thu, 31 Aug 2017, Juergen Gross wrote: >>>> I've applied it on top of tip:x86/apic and fixed up the merge conflicts >>>> mindlessly. Patch below. >>>> >>>> Juergen, can you please check the result? >>> You missed the updates to arch/x86/xen/xen-asm_64.S and the declarations >>> of the xen specific trap entries in arch/x86/include/asm/traps.h >> I'll try that again later today, unless you beat me to it. >> > > https://marc.info/?l=linux-kernel&m=150296063131595&w=2 should also be > picked up by the tip tree then since it applies on top of the > adjust_exception_frame patch. I will revert it from Xen tree as well. I have included this patch in my rebase on top of the tip tree, so it is no longer needed. Juergen
Powered by blists - more mailing lists