From patchwork Fri Apr 14 15:13:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83479 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp462784vqo; Fri, 14 Apr 2023 08:22:53 -0700 (PDT) X-Google-Smtp-Source: AKy350YuzmnjpH+JjMRwYMeBwD/Ms0cjxMhdy05B5WZgIyINQQaiKh9rxCt0Nb6mu4Is3L3AdLkV X-Received: by 2002:a05:6a20:7aa5:b0:d9:2028:dfd4 with SMTP id u37-20020a056a207aa500b000d92028dfd4mr5919343pzh.19.1681485773460; Fri, 14 Apr 2023 08:22:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681485773; cv=none; d=google.com; s=arc-20160816; b=ZqS+tvJDm+rZM+Vd3yBtBJ/1GJCQXb01BxZ+bgtJSemUBFvro7+ClHu1J6VMAsJC9n rInQNewDr25cRODLrKaZ62QyR/mZL1nbvl90D5zUqTFp0/k4l34H4ntd8LVayVuY2AaU p9mJZw0S0r0C+U9+FF/D1k9wZ+VWErQkskoUaHd6BJcW+53HzQAfKntJu6so4BLmmQsU mDrbJrv/0Kzi+U92y390VJFcrGKK6r7qBQZ4zIdd9STUDEtWjlh2xt6hwGxQXMj7iatc Y/o2jf85PhD21f4ro22AEThWAhlMJhzydyQ1psdgs4h1Z1lqUiUaUNi+eY+P04phT5zD 4VHQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=0s7FLGmq6KEU9kPZyqqOmuQkhjx3xVJa8rAQxrUV3p8=; b=JZRSQIsR4KCtkDkVazgTtowy5fCgROdTs5U+Uvh8uUXqJ5crfLAo9rUkThbHkcdY0a FIFy0KvoVNcwDcQRNw+0xxn/6DTe7EPgHitG8/uee9op/aIP1kWpLrXtvQ//rd8ux4a0 /yUNCh71+3DUuVBKvkoLeJMgdwJ9wa/N47tllo18FW3xqSZ0riNR438gxOSQgYDvASl4 wazY7CBfNDJh9y7lraBA5ogRSxoTM3oOql17EnfqBjcGyKD2MwlkVY6edv6168BH6MM/ 9PyTu5QjVHjdngqIij/EPXk1s2ecw5AiH2b9Iex5q4Yv3Jb53oCCu36/pKu8datD6qBp vokQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GZw4WI09; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 185-20020a6304c2000000b0051994b96204si4966407pge.662.2023.04.14.08.22.40; Fri, 14 Apr 2023 08:22:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GZw4WI09; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbjDNPNh (ORCPT + 99 others); Fri, 14 Apr 2023 11:13:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229874AbjDNPNe (ORCPT ); Fri, 14 Apr 2023 11:13:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1AD572AB; Fri, 14 Apr 2023 08:13:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 69E796478A; Fri, 14 Apr 2023 15:13:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BC54C433EF; Fri, 14 Apr 2023 15:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681485210; bh=dvJEqZwBxcCbVE0hi2EybF2Jd9r00VIRulxaBnnaXKw=; h=From:To:Cc:Subject:Date:From; b=GZw4WI0958R09GedK7ZrHdgARDAaMN4C7iJ3LztzRA1KhBV2zCiQdLFMXLURCyUW7 HjbJkMV0AK1PdIfvMI/RXmyY23PmUSIZ32JP499AltKs2TEFSPGqfgvt1LUAQrCD5k SRl6o3OUz8sjnqJwvve/XbwGpiudBTf6fYByxfxMSzUqikPYaGXPn7uSWrjtSZn0Nd LpQBZkUjCz8zJ487dwk4mUG20/jwoCvmolRU2cuJhDIc1Y7D0VVq5T/vZ7mbbE2Ofz XJAIk2VHPxHfMry+ittzuIiQ2zm9HOM//t8/VxLcl2EkZE+69/AxKQzvE+HJcf12Oe wCfPYJzIbxtEg== From: broonie@kernel.org To: Greg KH , Arnd Bergmann Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Miquel Raynal , Rob Herring , Srinivas Kandagatla Subject: linux-next: manual merge of the char-misc tree with the devicetree tree Date: Fri, 14 Apr 2023 16:13:26 +0100 Message-Id: <20230414151326.2134818-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763165626490945123?= X-GMAIL-MSGID: =?utf-8?q?1763165626490945123?= Hi all, Today's linux-next merge of the char-misc tree got a conflict in: include/linux/of.h between commit: 82174a0a9c5cf ("of: Move of_device_get_match_data() declaration") from the devicetree tree and commit: 673aa1ed1c9b6 ("of: Rename of_modalias_node()") from the char-misc tree. I fixed it up (see below) 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. +++ b/include/linux/of.h @@@ -370,8 -373,8 +370,9 @@@ extern int of_n_addr_cells(struct devic extern int of_n_size_cells(struct device_node *np); extern const struct of_device_id *of_match_node( const struct of_device_id *matches, const struct device_node *node); +extern const void *of_device_get_match_data(const struct device *dev); - extern int of_modalias_node(struct device_node *node, char *modalias, int len); + extern int of_alias_from_compatible(const struct device_node *node, char *alias, + int len); extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args); extern int __of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int cell_count, diff --cc include/linux/of.h index bc2eb39dcf753,9b7a99499ef35..0000000000000 --- a/include/linux/of.h