On Wed, Feb 28, 2018 at 11:56:23AM +0800, Alex Shi wrote: > From: Will Deacon <will.dea...@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.rutl...@arm.com> > Tested-by: Laura Abbott <labb...@redhat.com> > Tested-by: Shanker Donthineni <shank...@codeaurora.org> > Signed-off-by: Will Deacon <will.dea...@arm.com> > Signed-off-by: Alex Shi <alex....@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
