From patchwork Sun Nov 13 23:46:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 19482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1878056wru; Sun, 13 Nov 2022 15:53:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf74Vm/MTKKsEF/i6B16ooxuyJReblPOLwobYGiR0HUNHgtrJPY0K+ZQJndQsc8u5CZmKHcr X-Received: by 2002:a17:90a:fe5:b0:212:fd8c:523a with SMTP id 92-20020a17090a0fe500b00212fd8c523amr11458682pjz.52.1668383587015; Sun, 13 Nov 2022 15:53:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668383587; cv=none; d=google.com; s=arc-20160816; b=by4zgKgZWy5Aog2d7WThXe3sSgHk1yuen5/cuSxn1zf+LwE8gyBfOSlQa1YmtVI2la /aA3wdVO/L3/Sac1Td6Zfq/8BYJ0OwTclgZd6YqKZ9b4KQP8PkcuVatjeKzqHiMxrBCs sqrmOdxbtUtYSNU5tJuHthdM4dAKjRf4ErLwZku7paBPenbJomy43qoYsEFr6dOcJss2 7wqkvi307EZ3UtqsAt3x1a+9f+oc74aZJeidtgMO2hnOEKRAlc20DQ1fijiw8vBhURme cigJ++zpc/FQn1tXG2cmdpe1qSILxWzPX8M+epczQlHMGDfkCNs8q1UxFQu2GF3owPun 68Ag== 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=p9cwpJgX7TeFvxg8QIGt1dTdDdRe10v7vFZ2y90vuDE=; b=vRCo8pu+fwJDIX+xFj+na6lx/zC4QPlJSK5XKtFG3hbwNjXEWUlN0saQImwgY3TRqX ah/PXaxjy45eUSDblbibEsLS/H161YzPOV7RufGro144EpSRvnE7ihO3snv8sReH2qFx hhW9nUyIbvGKk8sgc4khCufPYre5ClcNNt9hV4eW5uNNYFymCTnDJQUG0R4wyYM5CwBg hBU6IVjyM/sVmTkA+2ShJwU9ZmpJ+fYo5DaVJMBZ3XIxj/iY8UmncExW8qj7ym0rUBXt pBMiUsk0Fp9v8uuRnYRdXpjD3NL1cIAIEsD87dSUedrzQx5RezEciy59Jv1ItqQTrtJu y3oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=I0xFcgKA; 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 r22-20020a632b16000000b00475cf211a41si4757479pgr.496.2022.11.13.15.52.52; Sun, 13 Nov 2022 15:53:06 -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=I0xFcgKA; 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 S235473AbiKMXql (ORCPT + 99 others); Sun, 13 Nov 2022 18:46:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbiKMXqj (ORCPT ); Sun, 13 Nov 2022 18:46:39 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282CBEAF; Sun, 13 Nov 2022 15:46:38 -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 4N9TcC1KJNz4x1V; Mon, 14 Nov 2022 10:46:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668383196; bh=p9cwpJgX7TeFvxg8QIGt1dTdDdRe10v7vFZ2y90vuDE=; h=Date:From:To:Cc:Subject:From; b=I0xFcgKAjNfAM+idvtTyKbowjW1pDEnKaBOn3YeTpO/Czwe11EbNmuDkF8N1xiAvl ltWsIevL+XtgjziYN2+c00WSmu7xruBxmKy2B6kQ14+XGpi3BkLl++1UhWZqCtjgeJ HCZ9eVe1YlSARgqV922MOtgJwE3KPuvWvlkZWyt1OiCsetrc3go3wY/ZCNc2BDpob/ hXFWTtmT1pe1VQcoEr+Fn7D3007OZY6gWkHbT8/1JZxcoDsLoyssAYQlS89a4a44HT hbxfzZNWbsiVrUzXXejs3p8bXEFMXRk1UammIvTAWKC1vsNAF5VymRmbUwZYdqMIfg pmBOMPBh05Wgw== Date: Mon, 14 Nov 2022 10:46:33 +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: <20221114104633.4961d175@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?1749426988155883677?= Hi all, Today's linux-next merge of the modules tree got conflicts in: include/linux/module.h kernel/module/kallsyms.c between commit: 73feb8d5fa3b ("kallsyms: Make module_kallsyms_on_each_symbol generally available") from the net-next tree and commit: 90de88426f3c ("livepatch: Improve the search performance of module_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 include/linux/module.h index 35876e89eb93,3b312a1fcf59..000000000000 --- a/include/linux/module.h diff --cc kernel/module/kallsyms.c index 4523f99b0358,329cef573675..000000000000 --- a/kernel/module/kallsyms.c