Merge branch 'x86/cleanups' into x86/mm
authorIngo Molnar <mingo@kernel.org>
Fri, 12 Feb 2021 12:39:32 +0000 (13:39 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 12 Feb 2021 12:40:02 +0000 (13:40 +0100)
commit40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f
tree9343f6be910d5ccd6195a68ef9f4c251abc7418c
parentc46f52231e79af025e2c89e889d69ec20a4c024f
parent3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2
Merge branch 'x86/cleanups' into x86/mm

Merge recent cleanups to the x86 MM code to resolve a conflict.

Conflicts:
arch/x86/mm/fault.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/mm/fault.c