From patchwork Wed Oct 4 00:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 148122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2440898vqb; Tue, 3 Oct 2023 17:44:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEj2YDWwzRl3q3UTTRSkGmRrg3NP2MlRrGm7Mk8MAQkmJx3vIc3AH4YnIEPbSD4WjifSuxY X-Received: by 2002:a05:6a21:a5a7:b0:15d:721e:44d5 with SMTP id gd39-20020a056a21a5a700b0015d721e44d5mr1254383pzc.49.1696380253892; Tue, 03 Oct 2023 17:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696380253; cv=none; d=google.com; s=arc-20160816; b=FJ9deN/J1K0XZ7+dBMKIu/GKu70g0c7AYydPn6L9Sz7+Xr5PetrJEB/V7AnJ5XTkV+ TNQv3I0kAQrmLghOK5hGsI3ik0Zly8Q43XvnyHlnOI7bjCUyYAMUEjiqS9z9/KUEgWaK xAzSgRZL+mGw9wFaN72szuSceiEOFcS2v7d3xOVK4uUg+6CPQYxWmVuvRZp8ISC6k360 EEHO3TWHvSiL3QG5iJFE0xTrdt8xsGhLuc3CobMUdWcFtSCbIhz+qiccSnjvk1ZtvoN0 8nVhc78AJbK4iWxUFN4ZdIJTY3mGG7uTdBNykVA7+1taSWpa6Cdjm9bvz8sy57kNoFae TEvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=VTUgVwGFs/x1FHkkO7KJ0hxykuV2FQw9OJPcxcssznM=; fh=kh65Z9L3jFyDrnlHXobOopWVp7iyDoSYUuoZVsaeh7Y=; b=jPOrEveSBTP/JM+OwEQtSC1StZW7apFO5mLRQPbo0EBP31JbFW3Gfhk0wNXq5/ltnM PFFl6INmg3AgP0p+wUYx6UWfCkGqD7wYbGNc+x9v5LnRDMs0JGx7dUsXqfuONnvSnIwy JthbkEcGqXhk0JMJNjxY/X1R8LXr741wtIWnPKptNJoqoBoGlotBHcOZsiZ2Lt12xwjI sPFKX4uSHnz+1e/6eEgncNFrYmc5Q+qgDgWdvZYKX86Bz7HsGAOG+ObMhDIM72V86V8w HUzUdbjqELF+Zd2r/IzDKRDzZlpk8PXA/85T+xuHTCq5rwXI1TdY80fi8VhV+RumxUIU FI/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Arnyhv6p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id ij21-20020a170902ab5500b001c386f8dd0asi2602668plb.179.2023.10.03.17.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 17:44:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Arnyhv6p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 32B6B81BBA2E; Tue, 3 Oct 2023 17:44:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232215AbjJDAoK (ORCPT + 17 others); Tue, 3 Oct 2023 20:44:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjJDAoJ (ORCPT ); Tue, 3 Oct 2023 20:44:09 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2A29A7; Tue, 3 Oct 2023 17:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696380238; bh=VTUgVwGFs/x1FHkkO7KJ0hxykuV2FQw9OJPcxcssznM=; h=Date:From:To:Cc:Subject:From; b=Arnyhv6pHMymBXETeIMD6pL9PdUcZg35nqkmN0t/DNMu36jY3M9g3gedTNzVKMF/F 7nx12bnxjLSE9wZIx2GQuq2jLpqogaZ0NasWb+g1lF9uBJkeEaN3+wukUAtSSyZwni wfYrV86DqcYU+79jzWkNexK8nA5RplWT+zV4suFZOks8ENsXkb2NWTcOx2LffP925n jTwKicr8VFkWY1q7rGgX42mpZe143k9Vm1sl1kOAWxBcDxPaxRQ+FC5tcVa74Pb/RB c/i03qgIDJD6vNsj8EMm5wHJ73ODlGE9sw7dVr6J575TY4JZvZQoYwWJHcKk+MPBHc PDD5ELeBeim5A== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S0bXs4ydwz4xM2; Wed, 4 Oct 2023 11:43:57 +1100 (AEDT) Date: Wed, 4 Oct 2023 11:43:54 +1100 From: Stephen Rothwell To: Luis Chamberlain , Masahiro Yamada Cc: Jack Brennen , Linux Kernel Mailing List , Linux Next Mailing List , Tiezhu Yang Subject: linux-next: manual merge of the modules tree with the kbuild tree Message-ID: <20231004114354.39a71ab3@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED 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 (snail.vger.email [0.0.0.0]); Tue, 03 Oct 2023 17:44:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778783621435504631 X-GMAIL-MSGID: 1778783621435504631 Hi all, Today's linux-next merge of the modules tree got a conflict in: scripts/mod/modpost.c between commit: 4074532758c5 ("modpost: Optimize symbol search from linear to binary search") from the kbuild tree and commit: dc95e422c283 ("module: Make is_valid_name() return bool") from the modules tree. I fixed it up (I used the former version of this files and applied the following merge resolution patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Wed, 4 Oct 2023 11:39:03 +1100 Subject: [PATCH] fix up for "module: Make is_valid_name() return bool" interacting with commit 4074532758c5 ("modpost: Optimize symbol search from linear to binary search") from the kbuild tree. Signed-off-by: Stephen Rothwell --- scripts/mod/modpost.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 6413f26fcb6b..5a0324f3257f 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -163,12 +163,12 @@ static inline unsigned int get_secindex(const struct elf_info *info, * * Internal symbols created by tools should be ignored by modpost. */ -static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym) +static inline bool is_valid_name(struct elf_info *elf, Elf_Sym *sym) { const char *name = elf->strtab + sym->st_name; if (!name || !strlen(name)) - return 0; + return false; return !is_mapping_symbol(name); }