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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150611134041.55e69982@canb.auug.org.au>
Date:	Thu, 11 Jun 2015 13:40:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>,
	Michael Ellerman <mpe@...erman.id.au>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Geoff Levand <geoff@...radead.org>
Subject: linux-next: manual merge of the block tree with the powerpc-mpe
 tree

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@...b.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@...n.com>
+ M:	Geoff Levand <geoff@...radead.org>
  L:	linuxppc-dev@...ts.ozlabs.org
 -L:	cbe-oss-dev@...ts.ozlabs.org
  S:	Maintained
  F:	drivers/block/ps3vram.c
  

Content of type "application/pgp-signature" skipped