Hi Jens,
Today's linux-next merge of the block tree got a conflict in
MAINTAINERS between commit a14ab6b6e0ad ("powerpc/cell: Drop
cbe-oss-dev mailing list from MAINTAINERS") from the powerpc-mpe tree
and commit 3715a5d014e1 ("MAINTAINERS: Update ps3vram block driver")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc MAINTAINERS
index b09702c197ca,b327ac39e951..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8018,7 -7853,9 +8019,8 @@@ F: sound/ppc/snd_ps3
PS3VRAM DRIVER
M: Jim Paris <jim@xxxxxxxx>
+ M: Geoff Levand <geoff@xxxxxxxxxxxxx>
L: linuxppc-dev@xxxxxxxxxxxxxxxx
-L: cbe-oss-dev@xxxxxxxxxxxxxxxx
S: Maintained
F: drivers/block/ps3vram.c
Attachment:
pgpXeOYKBl45C.pgp
Description: OpenPGP digital signature
