Merge branch 'linus' into x86/asm, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:06:47 +0000 (08:06 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:06:47 +0000 (08:06 +0100)
commit91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb
treedbea28420ff33aca40be8d3cd901305064b4ea24
parentd04fdafc066fed10cc9610b2f36f1d0ff0327864
parent1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
Merge branch 'linus' into x86/asm, to resolve conflict

 Conflicts:
arch/x86/mm/mem_encrypt.c

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