From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 7 Nov 2017 09:54:30 +0000 (+0100)
Subject: Merge branch 'x86/build' into x86/asm, to fix up conflicts
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=67caadc611eb1bf4aefc7c7a33dde30d12832569;p=linux.git

Merge branch 'x86/build' into x86/asm, to fix up conflicts

Conflicts:
	arch/x86/entry/syscalls/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

67caadc611eb1bf4aefc7c7a33dde30d12832569
diff --cc arch/x86/entry/syscalls/Makefile
index 331f1dca50854,e34c7a931994a..6fb9b57ed5ba0
--- a/arch/x86/entry/syscalls/Makefile
+++ b/arch/x86/entry/syscalls/Makefile
@@@ -1,6 -1,5 +1,6 @@@
 +# SPDX-License-Identifier: GPL-2.0
- out := $(obj)/../../include/generated/asm
- uapi := $(obj)/../../include/generated/uapi/asm
+ out := arch/$(SRCARCH)/include/generated/asm
+ uapi := arch/$(SRCARCH)/include/generated/uapi/asm
  
  # Create output directory if not already present
  _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \