diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-23 12:36:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-23 12:36:38 -0700 |
| commit | 404001ddf3e40369510a08b8b7e895c2da692b79 (patch) | |
| tree | 48803b50a62640da7ffb046ca0e32ac378574289 /net/nfc | |
| parent | e82d2af501072930983bfa7a0d200fc8aeb4f63c (diff) | |
| parent | 1e8b7b3dbb3103d577a586ca72bc329f7b67120b (diff) | |
Merge tag 'trace-fixes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing fixes from Steven Rostedt:
"Minor last minute fixes:
- Fix a very tight race between the ring buffer readers and resizing
the ring buffer
- Correct some stale comments in the ring buffer code
- Fix kernel-doc in the rv code
- Add a MODULE_DESCRIPTION to preemptirq_delay_test"
* tag 'trace-fixes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
rv: Update rv_en(dis)able_monitor doc to match kernel-doc
tracing: Add MODULE_DESCRIPTION() to preemptirq_delay_test
ring-buffer: Fix a race between readers and resize checks
ring-buffer: Correct stale comments related to non-consuming readers
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions