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 Weißschuh" <linux@weissschuh•net>,
"Xiu Jianfeng" <xiujianfeng@huawei•com>
Subject: linux-next: manual merge of the sysctl tree with Linus' tree
Date: Wed, 6 Dec 2023 13:49:41 +1100 [thread overview]
Message-ID: <20231206134941.4953e1ae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2556 bytes --]
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.
--
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
extern void perf_sample_event_took(u64 sample_len_ns);
- 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);
/* 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
static bool perf_rotate_context(struct perf_cpu_pmu_context *cpc);
- 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 = sysctl_perf_cpu_time_max_percent;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-12-06 2:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-06 2:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-21 2:20 linux-next: manual merge of the sysctl tree with Linus' tree Stephen Rothwell
2023-03-21 2:22 ` Stephen Rothwell
2023-03-21 5:40 ` Luis Chamberlain
2023-03-21 14:42 ` Jiaqi Yan
2009-11-17 8:04 Stephen Rothwell
2009-11-17 8:21 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231206134941.4953e1ae@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@weissschuh$(echo .)net \
--cc=mcgrof@kernel$(echo .)org \
--cc=mingo@kernel$(echo .)org \
--cc=xiujianfeng@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox