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 14:37:56 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Juergen Gross <jgross@...e.com>, Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, Stefano Stabellini <sstabellini@...nel.org>, Boris Ostrovsky <boris.ostrovsky@...cle.com>, David Vrabel <david.vrabel@...rix.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> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Thomas Garnier <thgarnie@...gle.com>, Vitaly Kuznetsov <vkuznets@...hat.com>, Xiong Zhang <xiong.y.zhang@...el.com>, "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com> Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree Hi all, On Wed, 29 Mar 2017 14:36:18 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > Today's linux-next merge of the xen-tip tree got a conflict in: > > arch/x86/xen/mmu.c > > between commits: > > 69218e47994d ("x86: Remap GDT tables in the fixmap section") > 907cd4390290 ("x86/xen: Change __xen_pgd_walk() and xen_cleanmfnmap() to support p4d") > f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t") > > from the tip tree and commit: > > 48a09cbf855e ("x86/xen: split off mmu_pv.c") > > from the xen-tip tree. > > I dropped the xen-tip tree for today, please get together and sort > these conflicts out. There were conflicts in arch/x86/xen/smp.c as well. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists