From patchwork Wed Dec 6 02:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 174280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3846690vqy; Tue, 5 Dec 2023 18:49:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXtuvzrDsTBSGrq9D5ShxH/nba+XCeRCMHmJtQz1BpBFXz14WCbyYxy8I6pT8REm+y0vDm X-Received: by 2002:a05:6870:2151:b0:1fb:75c:4011 with SMTP id g17-20020a056870215100b001fb075c4011mr219909oae.113.1701830996094; Tue, 05 Dec 2023 18:49:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701830996; cv=none; d=google.com; s=arc-20160816; b=er+gBodLnFj31gzk3EamN+XAVt1j6zpoHBKKg4I1DgC9ezPsd86azF9nsbEzUPN2Co nDNNIIAHa5FKWY5Mz0D4e+/D/AotbWtj8Lnpnpg+SMpxEN3/n0WZp6HEk9xySC8Uj4uz hCXPemWmX7tbpKownjMvwrRjFhNJv159DaafHGfGodSw6SUZmGCL3gXX/iqUyh42+8+O RPRBQAbkabEj/IxLSu0+KrMAum8P9EzQpEUxBQFcxrB3QfMntR9zNVYRWBAOavRJSb6W zcxbnmyiiwnC6Um0vflBHy03aO+MiDtE/DN3TOPuXcrZIHBvFE3P3b6z/bCFFTXISfsC hJxA== 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=kWSnwSWEWwAgy/sLkb4DDMMtTHVDhNvzb2zwc19N4YU=; fh=CQCyWsmPtpL+KVaFVDTr5jbWBeDzvCs8g4k2+JurhVA=; b=MoaAXzV8ud5JMSVssXeQpoYH2O9RWb/fnI3H6C2Z1Sl2utleB4J8ZYw4s5bP0J2vqp PlcMWOE8UbZA+gcw+UMLhE0S/MjUGyeDh8ZAwzb2ICdbbkUjhfqdTkqw8BaMqJO5VlDH uinFJRgbYsY18HchVpaiqfg6d5Mhw5xuoNpub7IJWehviQuLeTmqOUcz0bprL0vz+/V4 /zVZqdR2VfDrq6hCNgnc5b49gD0zQx4AB6m+RkYMO3Yz1FS3GeudtcTxCwz5vqUTbWI1 ulFqkY7Lcp6jvbbQn/BfwF7uvbGMpUFTim1ORauF9ZUZHSip4GIdHhgNmrji5rlGuYef ecoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="Bte/yh2a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id cf6-20020a056a02084600b005c66ca527ffsi5857917pgb.846.2023.12.05.18.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 18:49:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="Bte/yh2a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id B5A4480B87E8; Tue, 5 Dec 2023 18:49:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjLFCtm (ORCPT + 99 others); Tue, 5 Dec 2023 21:49:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjLFCtl (ORCPT ); Tue, 5 Dec 2023 21:49:41 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5965F1AA; Tue, 5 Dec 2023 18:49:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701830983; bh=kWSnwSWEWwAgy/sLkb4DDMMtTHVDhNvzb2zwc19N4YU=; h=Date:From:To:Cc:Subject:From; b=Bte/yh2avh9/wykxnQb217s9hTZBKyrNCK4XSTNSh7aN8e005VB3Skypc36rkO39O 3VO8Qp+81Db64c7Nov2MoRyl7mRWoD2LP0A7GZLVBX91L3kH1lp3/bffGB78s/Rjce DbjbI4uraur7znsefjjgT3s1ryzUia4X9/0DWDWdJt+Y6Vy1XSs0aiorEXFvfrx0Mc /XEF9Eq3U333WyS7lUbrl2FGvApMbZkLfQ1mRzMRO0aCeZ/GzL3nGrsivTtUTljKvb AWzSHQD7UMsVY/lShCiRmUF0x3DLvLfWhLMZmKF/y9kwXOr8QIocHnLQbqjdhwN8oX KUDwwbj5PGYsQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SlMLt4R9cz4wcH; Wed, 6 Dec 2023 13:49:42 +1100 (AEDT) Date: Wed, 6 Dec 2023 13:49:41 +1100 From: Stephen Rothwell To: Luis Chamberlain Cc: Ingo Molnar , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?utf-8?q?Wei?= =?utf-8?q?=C3=9Fschuh?= , Xiu Jianfeng Subject: linux-next: manual merge of the sysctl tree with Linus' tree Message-ID: <20231206134941.4953e1ae@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Tue, 05 Dec 2023 18:49:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784499138801181595 X-GMAIL-MSGID: 1784499138801181595 Hi all, Today's linux-next merge of the sysctl tree got conflicts in: include/linux/perf_event.h kernel/events/core.c between commit: e6814ec3ba19 ("perf/core: Rename perf_proc_update_handler() -> perf_event_max_sample_rate_handler(), for readability") from Linus' tree and commit: c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers") from the sysctl 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/perf_event.h index d2a15c0c6f8a,84f8f441d011..000000000000 --- a/include/linux/perf_event.h diff --cc kernel/events/core.c index 41b4d2278c94,26383e3582c6..000000000000 --- a/kernel/events/core.c