linux-kernel - linux-next: manual merge of the s390 tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110519103539.aa1b5094.sfr@canb.auug.org.au>
Date:	Thu, 19 May 2011 10:35:39 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>, Jens Axboe <jaxboe@...ionio.com>
Subject: linux-next: manual merge of the s390 tree with Linus' tree

Hi all,

Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/char/tape_block.c between commit 9fd097b14918 ("block:
unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers") from Linus'
tree and commit 263fa17de50e ("[S390] Remove tape block device driver")
from the s390 tree.

The latter just removes the file updated by the former.  So I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped