Commit aed0af05a873 for kernel

commit aed0af05a873445bed7f28f299da57d54765cc80
Merge: 7b6e48df8892 d008ba8be898
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Mar 7 09:50:54 2026 -0800

    Merge tag 'trace-v7.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

    Pull tracing fixes from Steven Rostedt:

     - Fix possible NULL pointer dereference in trace_data_alloc()

       On the trace_data_alloc() error path, it can call trigger_data_free()
       with a NULL pointer. This used to be a kfree() but was changed to
       trigger_data_free() to clean up any partial initialization. The issue
       is that trigger_data_free() does not expect a NULL pointer. Have
       trigger_data_free() return safely on NULL pointer.

     - Fix multiple events on the command line and bootconfig

       If multiple events are enabled on the command line separately and not
       grouped, only the last event gets enabled. That is:

          trace_event=sched_switch trace_event=sched_waking

       will only enable sched_waking whereas:

          trace_event=sched_switch,sched_waking

       will enable both.

       The bootconfig makes it even worse as the second way is the more
       common method.

       The issue is that a temporary buffer is used to store the events to
       enable later in boot. Each time the cmdline callback is called, it
       overwrites what was previously there.

       Have the callback append the next value (delimited by a comma) if the
       temporary buffer already has content.

     - Fix command line trace_buffer_size if >= 2G

       The logic to allocate the trace buffer uses "int" for the size
       parameter in the command line code causing overflow issues if more
       that 2G is specified.

    * tag 'trace-v7.0-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
      tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G
      tracing: Fix enabling multiple events on the kernel command line and bootconfig
      tracing: Add NULL pointer check to trigger_data_free()