From: Linus Torvalds Date: Thu, 21 Dec 2023 17:31:45 +0000 (-0800) Subject: Merge tag 'trace-v6.7-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... X-Git-Tag: Ubuntu-6.8.0-17.17~1861 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=13b734465a9d1cd09551d52eb5faf5fe55e6a9ea;p=mirror_ubuntu-kernels.git Merge tag 'trace-v6.7-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace Pull tracing fixes from Steven Rostedt: - Fix another kerneldoc warning - Fix eventfs files to inherit the ownership of its parent directory. The dynamic creation of dentries in eventfs did not take into account if the tracefs file system was mounted with a gid/uid, and would still default to the gid/uid of root. This is a regression. - Fix warning when synthetic event testing is enabled along with startup event tracing testing is enabled * tag 'trace-v6.7-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing / synthetic: Disable events after testing in synth_event_gen_test_init() eventfs: Have event files and directories default to parent uid and gid tracing/synthetic: fix kernel-doc warnings --- 13b734465a9d1cd09551d52eb5faf5fe55e6a9ea