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 19F7B1F7558; Tue, 3 Dec 2024 15:36:55 +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=1733240215; cv=none; b=OTM54/rnU6RfMTWm4IptJ3G7GriuccCpxDQgqS6mlt9ZBECPyn1F8iERDQNNA1fYpybGPn69gGRwJ4KhUh2gtNLmGFc2m+y/JKWRYp+kmn+Me+w9qSMg5SVaeOQyY3j70zO45iCQ1aR5ANDOiv/ib8vr7mjPQcUN+sCeRGXwvWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733240215; c=relaxed/simple; bh=h4n9EDO8V3RGnsfmGzgIoOaOp205xC3v3OttUMtYrr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S5arzfG36gIf1zudvNZ034IPWIJ65O4E/G1HWpkVeSVr+9n8PlopiOQQyYcjV6ljZ3TaaPkuKRD0YuKmfTBCT8kuXRkB+68KCpa49ijObg1psHQMR7TN4Mm0RBWbG2YqcUwY/awSNCY5aPb1OH872W1UqxlEoHp3pYAI5a0Jlc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xcagixMC; 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="xcagixMC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E6F0C4CECF; Tue, 3 Dec 2024 15:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733240214; bh=h4n9EDO8V3RGnsfmGzgIoOaOp205xC3v3OttUMtYrr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xcagixMCbYr0Supl4t4F0Lk0zVNzqSjqAp/+6nKnF0DmrgfVDwiBSvgNOt6usYohG yXHQe71n6+oQBsa4M+JUoqv19JOk+IJuDcxitPrNupF4pzc19/hAwxE73ZOosVd9PL q+W/dajbt6Q2V+EYZ+j0vi26q9KzVenaHwyxzeyM= 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.12 035/826] s390/syscalls: Avoid creation of arch/arch/ directory Date: Tue, 3 Dec 2024 15:36:02 +0100 Message-ID: <20241203144744.833275275@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@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.12-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 1bb78b9468e8a..e85c14f9058b9 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