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>

diff --cc arch/x86/entry/syscalls/Makefile
index 331f1dca5085443987254d96fda3ec5477f5ecc7,e34c7a931994a9d61c9c9ad8517c4b3370c6a0b0..6fb9b57ed5ba05dcc5247b26ee8b7b0575cf38e9
--- 1/arch/x86/entry/syscalls/Makefile
--- 2/arch/x86/entry/syscalls/Makefile
+++ b/arch/x86/entry/syscalls/Makefile
@@@ -1,6 -1,5 +1,6 @@@
- out := $(obj)/../../include/generated/asm
- uapi := $(obj)/../../include/generated/uapi/asm
 +# SPDX-License-Identifier: GPL-2.0
+ 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)') \