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;
Date:   Wed, 6 Dec 2023 13:49:41 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Luis Chamberlain <mcgrof@kernel.org>
Cc:     Ingo Molnar <mingo@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas =?UTF-8?B?V2Vpw59zY2h1aA==?= <linux@weissschuh.net>,
        Xiu Jianfeng <xiujianfeng@huawei.com>
Subject: linux-next: manual merge of the sysctl tree with Linus' tree
Message-ID: <20231206134941.4953e1ae@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/kxx6869DCCQaLoMRnCsYhtn";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/kxx6869DCCQaLoMRnCsYhtn
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 handl=
ers")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/perf_event.h
index d2a15c0c6f8a,84f8f441d011..000000000000
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@@ -1598,11 -1573,11 +1598,11 @@@ extern int sysctl_perf_cpu_time_max_per
 =20
  extern void perf_sample_event_took(u64 sample_len_ns);
 =20
- int perf_event_max_sample_rate_handler(struct ctl_table *table, int write,
 -int perf_proc_update_handler(const struct ctl_table *table, int write,
++int perf_event_max_sample_rate_handler(const struct ctl_table *table, int=
 write,
  		void *buffer, size_t *lenp, loff_t *ppos);
- int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+ int perf_cpu_time_max_percent_handler(const struct ctl_table *table, int =
write,
  		void *buffer, size_t *lenp, loff_t *ppos);
- int perf_event_max_stack_handler(struct ctl_table *table, int write,
+ int perf_event_max_stack_handler(const struct ctl_table *table, int write,
  		void *buffer, size_t *lenp, loff_t *ppos);
 =20
  /* Access to perf_event_open(2) syscall. */
diff --cc kernel/events/core.c
index 41b4d2278c94,26383e3582c6..000000000000
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@@ -450,8 -449,8 +450,8 @@@ static void update_perf_cpu_limits(void
 =20
  static bool perf_rotate_context(struct perf_cpu_pmu_context *cpc);
 =20
- int perf_event_max_sample_rate_handler(struct ctl_table *table, int write,
 -int perf_proc_update_handler(const struct ctl_table *table, int write,
 -		void *buffer, size_t *lenp, loff_t *ppos)
++int perf_event_max_sample_rate_handler(const struct ctl_table *table, int=
 write,
 +				       void *buffer, size_t *lenp, loff_t *ppos)
  {
  	int ret;
  	int perf_cpu =3D sysctl_perf_cpu_time_max_percent;

--Sig_/kxx6869DCCQaLoMRnCsYhtn
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVv4UUACgkQAVBC80lX
0GyINQf/eSteCfMI3LLL1P2E4N52cEdxvbhwstW5HPBsar0Ql/Rh1ZUDHHGrMw2p
mKQ6NnrS3xZAWQL3vnBdUyYqGkjSjOKMnBpoebnF5+xoJR0cW4OdW1xhGW3XWKFj
p6PlUHUFU3NjufnmheCCkBb1L5JbNjT9GeZYAydzQQWeCE1BBXHWWfu6BvlpNR+6
ReimJE6xbkKdXKt58rPdKMT/tIFB8ASF7T1EgUgNsHQjVNuhVQQyyzbwLDeMVIqz
9Iu+Mlc4eVjto12FzTNPyvJca8QT2PabR8UcAiL/6jTbEaRTBq6CnDFMoDcZGixM
FAmpL+SMq8mRWqHzZhU2R6Nm4mKv3A==
=gvAe
-----END PGP SIGNATURE-----

--Sig_/kxx6869DCCQaLoMRnCsYhtn--