From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 722B413792B; Thu, 12 Dec 2024 15:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019008; cv=none; b=E/t8yBuENKge3g3SP4sKPBG3hf5awt1NEnVKmiBVS1P7KFs1z54EwGmpUGE+cyKi6CZYMcOGgzqlI8XVZ4EuCik4cPS8nGfCPJ6Oki+gWRGko6iCVr8sLXVY6q4teAatmkLoSBiG2bugwytliJc7ycNthdVnvGUsxmaL8ftiLIU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019008; c=relaxed/simple; bh=PAeJx0d4YYlNBcFcjAmm0OXuqk4wy6ykTQARJPxwhHs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N6Q3GxZmNnEfxDkh0BdG1U0+zTifSr2NNQFRGTqUpTK7Foii8bk5Ojs/L2ccPH4Hg98HdoxDcEN9ET4uK3mdPB6dbq4CFiG6fUXX04G0Fs6H63olhrncPapGCf8QzvN1+bkfOS3MTfFJ70bkFQ8soRgdlQxgZekyIXfmrmqAWmM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xBX856FW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xBX856FW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D714C4CECE; Thu, 12 Dec 2024 15:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019007; bh=PAeJx0d4YYlNBcFcjAmm0OXuqk4wy6ykTQARJPxwhHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xBX856FWIIxHARovR1kOFsUaQnKLERbhx6pklFFvaJ/Rr4HWUUuVPTZz1VyQUJ3Hh fK2zmvmxd/gA+90NoIzsVScKC67DCAUArYF0fctAMkXxbcw5SgiW0SipNYzLmXFxXD 78YVL/IvumjUwu9POX8O4IiKLhLc+JYo+a/phvAc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Masahiro Yamada , Heiko Carstens , Sasha Levin Subject: [PATCH 6.1 063/772] s390/syscalls: Avoid creation of arch/arch/ directory Date: Thu, 12 Dec 2024 15:50:08 +0100 Message-ID: <20241212144352.549518335@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masahiro Yamada [ Upstream commit 0708967e2d56e370231fd07defa0d69f9ad125e8 ] Building the kernel with ARCH=s390 creates a weird arch/arch/ directory. $ find arch/arch arch/arch arch/arch/s390 arch/arch/s390/include arch/arch/s390/include/generated arch/arch/s390/include/generated/asm arch/arch/s390/include/generated/uapi arch/arch/s390/include/generated/uapi/asm The root cause is 'targets' in arch/s390/kernel/syscalls/Makefile, where the relative path is incorrect. Strictly speaking, 'targets' was not necessary in the first place because this Makefile uses 'filechk' instead of 'if_changed'. However, this commit keeps it, as it will be useful when converting 'filechk' to 'if_changed' later. Fixes: 5c75824d915e ("s390/syscalls: add Makefile to generate system call header files") Signed-off-by: Masahiro Yamada Link: https://lore.kernel.org/r/20241111134603.2063226-1-masahiroy@kernel.org Signed-off-by: Heiko Carstens Signed-off-by: Sasha Levin --- arch/s390/kernel/syscalls/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/syscalls/Makefile b/arch/s390/kernel/syscalls/Makefile index fb85e797946db..2bd7756288df6 100644 --- a/arch/s390/kernel/syscalls/Makefile +++ b/arch/s390/kernel/syscalls/Makefile @@ -12,7 +12,7 @@ kapi-hdrs-y := $(kapi)/unistd_nr.h uapi-hdrs-y := $(uapi)/unistd_32.h uapi-hdrs-y += $(uapi)/unistd_64.h -targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y) $(uapi-hdrs-y)) +targets += $(addprefix ../../../../,$(gen-y) $(kapi-hdrs-y) $(uapi-hdrs-y)) PHONY += kapi uapi -- 2.43.0