From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>
Gone but never forgotten.
[ Also moved Daniel's name to be consistent with the alphabetical order ]
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
CREDITS | 10 +++++++---
MAINTAINERS | 3 ---
2 files changed, 7 insertions(+), 6 deletions(-)
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@xxxxxxx
E: bauer@xxxxxxxxxxxxxxxxx
@@ -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@xxxxxxxxxxxxxxx
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 <bristot@xxxxxxxxxx>
M: Steven Rostedt <rostedt@xxxxxxxxxxx>
L: linux-trace-kernel@xxxxxxxxxxxxxxx
S: Maintained
@@ -19529,7 +19528,6 @@ S: Maintained
F: drivers/infiniband/ulp/rtrs/
RUNTIME VERIFICATION (RV)
-M: Daniel Bristot de Oliveira <bristot@xxxxxxxxxx>
M: Steven Rostedt <rostedt@xxxxxxxxxxx>
L: linux-trace-kernel@xxxxxxxxxxxxxxx
S: Maintained
@@ -22806,7 +22804,6 @@ F: kernel/trace/trace_mmiotrace.c
TRACING OS NOISE / LATENCY TRACERS
M: Steven Rostedt <rostedt@xxxxxxxxxxx>
-M: Daniel Bristot de Oliveira <bristot@xxxxxxxxxx>
S: Maintained
F: Documentation/trace/hwlat_detector.rst
F: Documentation/trace/osnoise-tracer.rst