# linux-next: manual merge of the block tree with the powerpc-mpe tree

- From: Stephen Rothwell \<hidden\>
- Date: 2015-06-11 03:40:55 
- List: linuxppc-dev
- Page: https://ratatoskr.run/linuxppc-dev/2015/06/4513631

```text
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@canb.auug.org.au

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 [ref]
+ M:	Geoff Levand [ref]
  L:	linuxppc-dev@lists.ozlabs.org
 -L:	cbe-oss-dev@lists.ozlabs.org
  S:	Maintained
  F:	drivers/block/ps3vram.c
  
```

## Attachments

- [(unnamed)](https://ratatoskr.run/linuxppc-dev/2015/06/4513631/attachment/0) (application/pgp-signature, 819 bytes)