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: Fri, 23 May 2014 10:23:30 +0100 From: Catalin Marinas <catalin.marinas@....com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: 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-next@...r.kernel.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "msalter@...hat.com" <msalter@...hat.com>, Matt Fleming <matt.fleming@...el.com>, Steve Capper <steve.capper@...aro.org> Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree On Fri, May 23, 2014 at 07:44:02AM +0100, Stephen Rothwell wrote: > Today's linux-next merge of the tip tree got a conflict in > arch/arm64/mm/mmu.c between commit a501e32430d4 ("arm64: Clean up the > default pgprot setting") and 206a2a73a62d ("arm64: mm: Create gigabyte > kernel logical mappings where possible") from the arm64 tree and commit > d7ecbddf4cae ("arm64: Add function to create identity mappings") from > the tip tree. > > I fixed it up (maybe - see below - this may not be complete) and can > carry the fix as necessary (no action is required). Thanks for fixing it up, it is correct. (but I now have to go after the arm64 EFI_STUB guys as it breaks non-EFI booting). -- Catalin -- 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/
Powered by blists - more mailing lists