Automatic merge of 'next' into merge (2025-01-17 10:12)

Author: maddy-kerneldev

MAINTAINERS

@@ -4131,7 +4131,6 @@ S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
 
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
-M:	Michael Ellerman <[email protected]>
 M:	Hari Bathini <[email protected]>
 M:	Christophe Leroy <[email protected]>
 R:	Naveen N Rao <[email protected]>
@@ -12632,7 +12631,7 @@ F:	arch/mips/include/uapi/asm/kvm*
 F:	arch/mips/kvm/
 
 KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
-M:	Michael Ellerman <[email protected]>
+M:	Madhavan Srinivasan <[email protected]>
 R:	Nicholas Piggin <[email protected]>
 L:	[email protected]
 L:	[email protected]
@@ -13211,11 +13210,11 @@ X:	drivers/macintosh/adb-iop.c
 X:	drivers/macintosh/via-macii.c
 
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
+M:	Madhavan Srinivasan <[email protected]>
 M:	Michael Ellerman <[email protected]>
 R:	Nicholas Piggin <[email protected]>
 R:	Christophe Leroy <[email protected]>
 R:	Naveen N Rao <[email protected]>
-M:	Madhavan Srinivasan <[email protected]>
 L:	[email protected]
 S:	Supported
 W:	https://github.com/linuxppc/wiki/wiki