linux-next: manual merge of the block tree with Linus' tree

[Stephen Rothwell]

Hi Jens,

Today's linux-next merge of the block tree got conflicts in
drivers/block/paride/pcd.c and drivers/cdrom/viocd.c between commit
9fd097b14918 ("block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe
drivers") from Linus' tree and commit d4dc210f69bc ("block: don't block
events on excl write for non-optical devices") from the block tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/block/paride/pcd.c
index 8690e31,a0aabd9..0000000
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@@ -320,6 -320,8 +320,7 @@@ static void pcd_init_units(void
  		disk->first_minor = unit;
  		strcpy(disk->disk_name, cd->name);	/* umm... */
  		disk->fops = &pcd_bdops;
+ 		disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
 -		disk->events = DISK_EVENT_MEDIA_CHANGE;
  	}
  }
  
diff --cc drivers/cdrom/viocd.c
index e427fbe,ae15a4d..0000000
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@@ -625,7 -625,9 +625,8 @@@ static int viocd_probe(struct vio_dev *
  	blk_queue_max_hw_sectors(q, 4096 / 512);
  	gendisk->queue = q;
  	gendisk->fops = &viocd_fops;
- 	gendisk->flags = GENHD_FL_CD|GENHD_FL_REMOVABLE;
+ 	gendisk->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE |
+ 			 GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
 -	gendisk->events = DISK_EVENT_MEDIA_CHANGE;
  	set_capacity(gendisk, 0);
  	gendisk->private_data = d;
  	d->viocd_disk = gendisk;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/