From: Will Deacon <will.deacon@arm.com>
Date: Fri, 6 Jul 2018 12:15:06 +0000 (+0100)
Subject: Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into... 
X-Git-Tag: v4.19-rc1~154^2~62
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f3551520416978111b422b7c177f6f1f6d75ff62;p=linux.git

Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core

Pull in core ioremap changes from -tip, since we depend on these for
re-enabling huge I/O mappings on arm64.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---

f3551520416978111b422b7c177f6f1f6d75ff62