linux-kernel - Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree

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]

Date:	Mon, 22 Feb 2016 09:24:15 +0000
From:	Catalin Marinas <catalin.marinas@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Christoffer Dall <cdall@...columbia.edu>,
	Marc Zyngier <marc.zyngier@....com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Will Deacon <will.deacon@....com>,
	James Morse <james.morse@....com>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree

Hi Stephen,

On Mon, Feb 22, 2016 at 01:28:29PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
> 
>   arch/arm64/include/asm/cpufeature.h
>   arch/arm64/kernel/cpufeature.c
> 
> between commit:
> 
>   d5370f754875 ("arm64: prefetch: add alternative pattern for CPUs without a prefetcher")
>   57f4959bad0a ("arm64: kernel: Add support for User Access Override")
>   705441960033 ("arm64: kernel: Don't toggle PAN on systems with UAO")
> 
> from the arm64 tree and commit:
> 
>   d0be74f771d5 ("arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature")
> 
> from the kvm-arm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The fix-up looks correct indeed. Thanks.

-- 
Catalin