* linux-next: manual merge of the block tree with the powerpc-mpe tree
@ 2015-06-11 3:40 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-11 3:40 UTC (permalink / raw)
To: Jens Axboe, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Geoff Levand
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
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 <jim@jtan•com>
+ M: Geoff Levand <geoff@infradead•org>
L: linuxppc-dev@lists•ozlabs.org
-L: cbe-oss-dev@lists•ozlabs.org
S: Maintained
F: drivers/block/ps3vram.c
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-11 3:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-11 3:40 linux-next: manual merge of the block tree with the powerpc-mpe tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox