From patchwork Wed Oct 4 12:48:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 148292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp106348vqb; Wed, 4 Oct 2023 05:49:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgnl2WdHpcz/XXvK+EbAaTfwaIfefHDPJA9X0fhktguOdymzZaOjUMl5NP1ts0Ja6rcMvt X-Received: by 2002:a05:6a21:4982:b0:15d:b699:5522 with SMTP id ax2-20020a056a21498200b0015db6995522mr2055892pzc.34.1696423739885; Wed, 04 Oct 2023 05:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696423739; cv=none; d=google.com; s=arc-20160816; b=V17B7NEeBoMlGrKx7KZ4meQhXBXKht9vgfiKxotF5RN23puSvGVNW9oZnmS7fUdOk0 z89h69cUo2KuhY9yFnPOnBtu3GarsoHzDOMkpwyu7G27cbXsbi3PjobuqLrs29A65rdF 0lMsiWCNerhLZXlbzFULElZvrpUapKIh5Zk2jzU7E7Znxp8bl6nvT5eIDyhRuriXW/42 nqp4STKGPIReYIeBIjbP5zdNvM9diLh9BPuKcOc7TswVNAxQpiDuAlfD8NcOwjmjroHi V70lWnB00bEBC7wUruy59t9nz3ZA+iQWh5bEMcBauRpJlvjUr4vi1IKRwUBmsa2I2CBa Z3LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xXV5MKkei4hht3laKnjttdQ5iOLNv7dNMKS8QGLbFLc=; fh=2l2Pj/3AjLcQ1MeOjzN0dPVkgGCjgO6oWLeAwBJm39w=; b=N0AV/oXsp4zN5xmFqmrt/avY6xy2O3WOae61ftkbgkdmLUCSoyey+8cB/TwwHO/UH0 igwaRNqGlLTcLMNv5nhMazTeLVLcsD6sZTwPCBIy4GhnXvcTFSiFuSLVmzu14V7L593S ui4n6p/4jf+y4h34mmu5Svs6RZpuQyfk2UTyB8CHhKj4OezmZ+XLnsxgrTCLsid/TeSU c+e9edhZtiYk9HsHi5KflnW1CqMmcxdqlFlLUt44MAsEa258Q534UiP7BLgKepiTYPlf Q6BaT+JApUV5eHn6DeCUE79IDfO5lShujbFC3nmbTieq1jbKwmQz5psuOGu2yphpoMTz 5nRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cXzreQBM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id c5-20020a6566c5000000b00584a7863503si3709491pgw.372.2023.10.04.05.48.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 05:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cXzreQBM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 015358348D92; Wed, 4 Oct 2023 05:48:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242492AbjJDMs5 (ORCPT + 18 others); Wed, 4 Oct 2023 08:48:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242491AbjJDMsw (ORCPT ); Wed, 4 Oct 2023 08:48:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1335693; Wed, 4 Oct 2023 05:48:49 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00C65C433C9; Wed, 4 Oct 2023 12:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696423728; bh=GCXPtG2gS4xIl3E4smfsoQMIyJon1TmicxEyAyK0wVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXzreQBMuuF74CBgHzSwEN2XP6h0oZD0m2xCM0zXXfhTbBayi7b7BfShjv/w/GuwX dcleLXW/kTjBlrlwrCkSAwOnrkrUMQ8ZPR+MPv8maO0c5cpLYMSxcSCA3hTnnBG3fx FpSawKI8+A2WhDqTGl1Sqqb7u0eQJa82fgEHccU6kdfKq3uCPVskQmzIqGFrXPeZgE Tl0+U0BvwXOvIl0LC2W7igEasQ2LnMESCOjarMQOSEaItwmZXGox9RenhfWE5waGQq 5Bys358TN2G57KT8cRrUbO9E8U3MPS1t45ikV712Dys5mBOly9cdjewrOSjsULg9Zv VWHL+PeaBg7Hw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org, Shuah Khan Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/2] kbuild: Merge per-arch config for kselftest-merge target Date: Wed, 4 Oct 2023 14:48:37 +0200 Message-Id: <20231004124837.56536-3-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004124837.56536-1-bjorn@kernel.org> References: <20231004124837.56536-1-bjorn@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 05:48:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778829219124138094 X-GMAIL-MSGID: 1778829219124138094 From: Björn Töpel Some kselftests has a per-arch config, e.g. tools/testing/selftests/bpf/config.s390x. Make sure these configs are picked up by the kselftest-merge target. Signed-off-by: Björn Töpel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 170fb2f5e378..0303acb311cc 100644 --- a/Makefile +++ b/Makefile @@ -1367,7 +1367,7 @@ kselftest-%: headers FORCE PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)find $(srctree)/tools/testing/selftests -name config | \ + $(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \ xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig