linux-kernel - linux-next: manual merge of the block tree with the s390 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: <20100824105328.9bf22335.sfr@canb.auug.org.au>
Date:	Tue, 24 Aug 2010 10:53:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Peter Oberparleiter <peter.oberparleiter@...ibm.com>,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: linux-next: manual merge of the block tree with the s390 tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
drivers/s390/char/tape_block.c between commit
7dc74a8fdb22f4410a2d8e45353c9ea75821a9ba ("[S390] tape: fix kernel panic
when setting tape device offline") from the s390 tree and commit
52cc2eef31587b22ce9fbe77b064a031a9613ab0 ("block: switch s390 tape_block
and mg_disk to elevator_change()") from the block tree.

I assume that the latter removes the need for the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped