refs/heads/merge/for-next - pub/scm/linux/kernel/git/trace/linux-trace

commit: ebe677cbc142fadd5dab60b6b82f1bfe4b686368
[log]
author: Steven Rostedt <rostedt@goodmis.org>
Thu Mar 26 17:09:27 2026 -0400
committer: Steven Rostedt (Google) <rostedt@goodmis.org>
Thu Mar 26 17:09:27 2026 -0400
tree: 576a2a0bf50a6046a80f3ce0da4372a2311e1662
parent: bade44fe546212e142befb69ba22f34944030a99 [diff]
parent: dc1d9408c961c1c4d4b3b99a1d9390c17e13de71 [diff]

Merge commit 'dc1d9408c961c1c4d4b3b99a1d9390c17e13de71' into trace/merge/core

 Conflicts:
	kernel/trace/trace.c

tree: 576a2a0bf50a6046a80f3ce0da4372a2311e1662