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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpzempENcOP7.pgp
Description: PGP signature
