diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 14:08:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 14:08:42 -0700 |
| commit | f669aac34c5f76b58e6cad1fef0643e5ae16d413 (patch) | |
| tree | 2fd3bfbe444ce62a4434a23df7303f58ff6c2b6f | |
| parent | 1777e471e11da7cba3db8dfa82822dcef6fd7794 (diff) | |
| parent | 5f7c72df1ba6ba00ee163ba4049c785ac5930759 (diff) | |
| download | lwn-f669aac34c5f76b58e6cad1fef0643e5ae16d413.tar.gz lwn-f669aac34c5f76b58e6cad1fef0643e5ae16d413.zip | |
Merge tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing CREDITS file update from Steven Rostedt:
"Update of MAINTAINERS and CREDITS file
- Update Daniel Bristot de Oliveira's entry in MAINTAINERS with
respect to his tracing code.
- Add more credits to him in CREDITS file and move his entry to be
alphabetical"
* tag 'trace-v6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: Update MAINTAINERS file
| -rw-r--r-- | CREDITS | 10 | ||||
| -rw-r--r-- | MAINTAINERS | 3 |
2 files changed, 7 insertions, 6 deletions
@@ -271,9 +271,6 @@ D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+) D: Various bugfixes and changes to sound drivers S: USA -N: Daniel Bristot de Oliveira -D: Scheduler contributions, notably: SCHED_DEADLINE - N: Carlos Henrique Bauer E: chbauer@acm.org E: bauer@atlas.unisinos.br @@ -534,6 +531,13 @@ S: Kopmansg 2 S: 411 13 Goteborg S: Sweden +N: Daniel Bristot de Oliveira +D: Scheduler contributions, notably: SCHED_DEADLINE +D: Real-time Linux Analysis +D: Runtime Verification +D: OS Noise and Latency Tracers +S: Brazil and Italy + N: Paul Bristow E: paul@paulbristow.net W: https://paulbristow.net/linux/idefloppy.html diff --git a/MAINTAINERS b/MAINTAINERS index 655ea596b597..f66231d4f953 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19127,7 +19127,6 @@ F: include/uapi/linux/rtc.h F: tools/testing/selftests/rtc/ Real-time Linux Analysis (RTLA) tools -M: Daniel Bristot de Oliveira <bristot@kernel.org> M: Steven Rostedt <rostedt@goodmis.org> L: linux-trace-kernel@vger.kernel.org S: Maintained @@ -19774,7 +19773,6 @@ S: Maintained F: drivers/infiniband/ulp/rtrs/ RUNTIME VERIFICATION (RV) -M: Daniel Bristot de Oliveira <bristot@kernel.org> M: Steven Rostedt <rostedt@goodmis.org> L: linux-trace-kernel@vger.kernel.org S: Maintained @@ -23067,7 +23065,6 @@ F: kernel/trace/trace_mmiotrace.c TRACING OS NOISE / LATENCY TRACERS M: Steven Rostedt <rostedt@goodmis.org> -M: Daniel Bristot de Oliveira <bristot@kernel.org> S: Maintained F: Documentation/trace/hwlat_detector.rst F: Documentation/trace/osnoise-tracer.rst |