[PATCH 01/29] arm64: mm: Use non-global mappings for kernel space

[Greg KH]

On Wed, Feb 28, 2018 at 11:56:23AM +0800, Alex Shi wrote:
> From: Will Deacon <will.deacon at arm.com>
> 
> commit e046eb0c9bf2 upstream.
> 
> In preparation for unmapping the kernel whilst running in userspace,
> make the kernel mappings non-global so we can avoid expensive TLB
> invalidation on kernel exit to userspace.
> 
> Reviewed-by: Mark Rutland <mark.rutland at arm.com>
> Tested-by: Laura Abbott <labbott at redhat.com>
> Tested-by: Shanker Donthineni <shankerd at codeaurora.org>
> Signed-off-by: Will Deacon <will.deacon at arm.com>
> Signed-off-by: Alex Shi <alex.shi at linaro.org>
> 
> Conflicts:
> 	skip PTE_RDONLY of PAGE_NONE in arch/arm64/include/asm/pgtable-prot.h

These "Conflicts:" lines need to be removed, or put below the --- line
please.

thanks,

greg k-h