Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/loongarch/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/trace/events/mmflags.h
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge