Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67caadc6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



Conflicts:
	arch/x86/entry/syscalls/Makefile

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b3d9a136 af8e9470

arch/x86/entry/syscalls/Makefile

+2 −2
Original line number Diff line number Diff line 
# 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)') \