diff mbox series

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

Message ID 20231206134941.4953e1ae@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the sysctl tree with Linus' tree |

Commit Message

Stephen Rothwell Dec. 6, 2023, 2:49 a.m. UTC 
  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 mbox series

Patch

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