On Wed, Feb 28, 2018 at 11:56:23AM +0800, Alex Shi wrote: > From: Will Deacon <[email protected]> > > 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 <[email protected]> > Tested-by: Laura Abbott <[email protected]> > Tested-by: Shanker Donthineni <[email protected]> > Signed-off-by: Will Deacon <[email protected]> > Signed-off-by: Alex Shi <[email protected]> > > 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
