The following commit has been merged into the x86/cpu branch of tip:

Commit-ID:     b04472e131016c5e4022f94db82b8d15a1e93db9
Gitweb:        https://git.kernel.org/tip/b04472e131016c5e4022f94db82b8d15a1e93db9
Author:        Lukas Bulwahn <lukas.bulwahn@redhat.com>
AuthorDate:    Tue, 19 May 2026 05:45:50 +02:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Fri, 29 May 2026 19:56:02 -07:00

MAINTAINERS: Drop obsolete FPU EMULATOR section

Commit

  823caa173884 ("x86/fpu: Remove the math-emu/ FPU emulation library")

removes the directory arch/x86/math-emu/, but misses to also remove the
MAINTAINERS section FPU EMULATOR.

As Bill Metzenthen is already mentioned in the CREDITS for his contribution
to the FPU emulator, just add the email address in the MAINTAINERS section
to the CREDITS and then drop the obsolete FPU EMULATOR section.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://patch.msgid.link/20260519034550.276316-1-lukas.bulwahn@redhat.com
---
 CREDITS     | 1 +
 MAINTAINERS | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CREDITS b/CREDITS
index 17962bd..42a7908 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2804,6 +2804,7 @@ D: Some of PAS 16 mixer & PCM support, inet6-apps
 
 N: William (Bill) Metzenthen
 E: billm@suburbia.net
+E: billm@melbpc.org.au
 D: Author of the FPU emulator.
 D: Minor kernel hacker for other lost causes (Hercules mono, etc).
 S: 22 Parker Street
diff --git a/MAINTAINERS b/MAINTAINERS
index c152274..dcdc7bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10101,12 +10101,6 @@ F:	Documentation/fpga/
 F:	drivers/fpga/
 F:	include/linux/fpga/
 
-FPU EMULATOR
-M:	Bill Metzenthen <billm@melbpc.org.au>
-S:	Maintained
-W:	https://floatingpoint.billm.au/
-F:	arch/x86/math-emu/
-
 FRAMEBUFFER CONSOLE
 M:	Helge Deller <deller@gmx.de>
 M:	Thomas Zimmermann <tzimmermann@suse.de>