linux-kernel - Re: [GIT PULL] arm64 updates for 4.6

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

Message-ID: <20160318164607.GH4645@e104818-lin.cambridge.arm.com>
Date:	Fri, 18 Mar 2016 16:46:08 +0000
From:	Catalin Marinas <catalin.marinas@....com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Matt Fleming <matt@...eblueprint.co.uk>,
	Will Deacon <will.deacon@....com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Marc Zyngier <marc.zyngier@....com>,
	Paolo Bonzini <pbonzini@...hat.com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL] arm64 updates for 4.6

On Thu, Mar 17, 2016 at 08:08:37PM -0700, Linus Torvalds wrote:
> On Thu, Mar 17, 2016 at 11:26 AM, Catalin Marinas
> <catalin.marinas@....com> wrote:
> >
> > Here are the main arm64 updates for 4.6. There are some relatively
> > intrusive changes to support KASLR, the reworking of the kernel virtual
> > memory layout and initial page table creation. These would conflict with
> > some of the arm64 KVM changes merged via the KVM tree (adding support
> > for the "Virtualisation Host Extensions" ARMv8.1 feature). The prior
> > merge resolution in linux-next should be fine but I also included the
> > output of "git show --cc" on a local merge I did against last night's
> > mainline tree (at the end of this email). If there are any issues please
> > let me know.
> 
> I think I got the same merge resolution except for the ordering of the
> arm64_features[] table, where I made ARM64_HAS_VIRT_HOST_EXTN go after
> ARM64_ALT_PAN_NOT_UAO, the way it is numbered. That shouldn't matter.
> 
> But since I don't do cross builds or test arm64, you should
> double-check that I didn't screw something up.

The merge conflict resolution is fine, thanks (we have a bug to fix on
the interaction between the new KVM features and KASLR;  patches should
appear sometime next week).

-- 
Catalin