linux-next: manual merge of the sysctl tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

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: pgp9oczyFMqlA.pgp
Description: OpenPGP digital signature