From patchwork Sun Nov 13 23:52:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 19483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1882382wru; Sun, 13 Nov 2022 16:07:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf7v0+ZiQWoIxnfyoWtXuw5ChDBOR498BtllxPz1MaaRL35XdpV9SxVnxE/zgcakeCvJJXkH X-Received: by 2002:a17:90a:b108:b0:212:d484:b410 with SMTP id z8-20020a17090ab10800b00212d484b410mr11542522pjq.211.1668384420516; Sun, 13 Nov 2022 16:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668384420; cv=none; d=google.com; s=arc-20160816; b=JCrv4kl9QcGbptg5yPT3H7QrdNNGfXI05vhFAwlakG9uVPEIPSkAJNsNReMGDTxp+j 3WplRbVdC1i4zO5P6pBDV8ouSIG8Y7vGfcyFEkHms8PGnue1he63TA8ebhGR0wBJEXfQ gLbh4j6RS+wgFf6EKgMVHLBYe5/OVjmM4lbpmo2Z7fPpqSLC7xoX5P5X1PR0+m2L66lC JHToBKPbdqSVAUN3aZTg9tNaa/BLgvkYlbmgN93yEWwsn7rDAPoKCwu/NPsoLeIhSvEU ZkauEYvYykRoPFBqx6H9WT0X8xF8rYaAxHtHr7um+Cov4G9tqAPswo68FXwQPF2LX2dr 0BuA== 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=pUcy/XN+scuJWHAuLv8FG4qKklNNeaoNs6lPTos5qfg=; b=VMLzUJh531dFVIf4Ju3PYaQwQ4DcMZR8PYV/MLfDCSDdf9XcxRmEfeZ+vhG2Ca4O/s +gANN62ukezF8RwAS1xPXM3ZNuKmSzaK10ewX41xT6cEzYI+l6wljX4N0u8V4AEqQ0NT MaGRxQn/CVnfH3xJotXtuCnan9YLfK+Vl+qFxXWXMv7RMsf6RPGjMNyUTEGG28jrDA9x SBB+/mqfJZmgFk6VOcEVMQmXs6Oq/+Rozsa0t2dl3ThF2sS+8hZvHzK3HRSftwD287bh 1jj6ev6KVG0RIOQeSwYDgqPRkJ1BSk4R3zqTjeJD84QuNYzijpNnKXf94xEJeCpk06wX 2rGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="nzVKfxz/"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j6-20020a056a00234600b0056ca7c10cf2si9037110pfj.251.2022.11.13.16.06.47; Sun, 13 Nov 2022 16:07:00 -0800 (PST) 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=@canb.auug.org.au header.s=201702 header.b="nzVKfxz/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235510AbiKMXw5 (ORCPT + 99 others); Sun, 13 Nov 2022 18:52:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbiKMXw4 (ORCPT ); Sun, 13 Nov 2022 18:52:56 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05C95B7C1; Sun, 13 Nov 2022 15:52:53 -0800 (PST) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N9TlQ74TLz4xYV; Mon, 14 Nov 2022 10:52:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668383571; bh=pUcy/XN+scuJWHAuLv8FG4qKklNNeaoNs6lPTos5qfg=; h=Date:From:To:Cc:Subject:From; b=nzVKfxz/KExLltII9HC5QfcEp9++WqNqsV7ai+H4kjwA0FZZpJEIRA2bTiW/C2KzJ jXxAfzXpA9M8iqOtd1xXi8AVj+LVbfY17pfyDom8wKvDFhnU594GfgGE80JfT0RBtc QrRu7IU3Q4fCSt1AN6bAfIMLMfDNpK+NGltqP8ZNMy2JljRShC9a2w1vD2fEmZiO9A fAZ8vfPVrcuqiKuN3RlffEn9EAd2BXypj7fmXrqML6EQY8EdkNz7wVtQ8/YVu0Wb/w v9uqkGxsG6qmTNoY6o6vMW+XdelsmLxPO2u6kzU4cKx1ZToMqddO6H4V9XzpCmKEqO Q0yYlhVHRemlQ== Date: Mon, 14 Nov 2022 10:52:49 +1100 From: Stephen Rothwell To: Luis Chamberlain , David Miller Cc: Networking , Alexei Starovoitov , Jiri Olsa , Linux Kernel Mailing List , Linux Next Mailing List , Zhen Lei Subject: linux-next: manual merge of the modules tree with the net-next tree Message-ID: <20221114105249.4548adbc@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,SPF_HELO_PASS,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749426988155883677?= X-GMAIL-MSGID: =?utf-8?q?1749427862326002298?= Hi all, Today's linux-next merge of the modules tree got a conflict in: kernel/trace/ftrace.c between commit: 3640bf8584f4 ("ftrace: Add support to resolve module symbols in ftrace_lookup_symbols") from the net-next tree and commit: 477f7e48d4f4 ("kallsyms: Delete an unused parameter related to kallsyms_on_each_symbol()") from the modules 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. diff --cc kernel/trace/ftrace.c index 705b990d264d,7a06991624d4..000000000000 --- a/kernel/trace/ftrace.c