Subject: linux-next: manual merge of the block tree with the s390 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 24 Aug 2010 10:53:28 +1000

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/