Automatic merge of 'next' into merge (2024-07-17 22:22)

.mailmap

@@ -473,6 +473,8 @@ Nadia Yvette Chambers <[email protected]> William Lee Irwin III <wli@holomorphy
 Naoya Horiguchi <[email protected]> <[email protected]>
 Naoya Horiguchi <[email protected]> <[email protected]>
 Nathan Chancellor <[email protected]> <[email protected]>
+Naveen N Rao <[email protected]> <[email protected]>
+Naveen N Rao <[email protected]> <[email protected]>
 Neeraj Upadhyay <[email protected]> <[email protected]>
 Neeraj Upadhyay <[email protected]> <[email protected]>
 Neil Armstrong <[email protected]> <[email protected]>

MAINTAINERS

@@ -3857,8 +3857,10 @@ S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
 
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
-M:	Naveen N. Rao <[email protected]>
+M:	Hari Bathini <[email protected]>
+M:	Christophe Leroy <[email protected]>
 M:	Michael Ellerman <[email protected]>
+R:	Naveen N Rao <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	arch/powerpc/net/
@@ -12313,7 +12315,7 @@ F:	mm/kmsan/
 F:	scripts/Makefile.kmsan
 
 KPROBES
-M:	Naveen N. Rao <naveen[email protected]>
+M:	Naveen N Rao <naveen@kernel.org>
 M:	Anil S Keshavamurthy <[email protected]>
 M:	"David S. Miller" <[email protected]>
 M:	Masami Hiramatsu <[email protected]>
@@ -12689,7 +12691,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:	Michael Ellerman <[email protected]>
 R:	Nicholas Piggin <[email protected]>
 R:	Christophe Leroy <[email protected]>
-R:	Naveen N. Rao <naveen[email protected]>
+R:	Naveen N Rao <naveen@kernel.org>
 L:	[email protected]
 S:	Supported
 W:	https://github.com/linuxppc/wiki/wiki