diff --git a/CREDITS b/CREDITS index 88c4c08cb613..d7798910e99f 100644 --- a/CREDITS +++ b/CREDITS @@ -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 2e1b8bbacb5e..0b7e4cd4ffd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18895,7 +18895,6 @@ F: include/uapi/linux/rtc.h F: tools/testing/selftests/rtc/ Real-time Linux Analysis (RTLA) tools -M: Daniel Bristot de Oliveira M: Steven Rostedt L: linux-trace-kernel@vger.kernel.org S: Maintained @@ -19529,7 +19528,6 @@ S: Maintained F: drivers/infiniband/ulp/rtrs/ RUNTIME VERIFICATION (RV) -M: Daniel Bristot de Oliveira M: Steven Rostedt L: linux-trace-kernel@vger.kernel.org S: Maintained @@ -22806,7 +22804,6 @@ F: kernel/trace/trace_mmiotrace.c TRACING OS NOISE / LATENCY TRACERS M: Steven Rostedt -M: Daniel Bristot de Oliveira S: Maintained F: Documentation/trace/hwlat_detector.rst F: Documentation/trace/osnoise-tracer.rst