Merge branch 'block'

diff --cc block/ioctl.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
index 365024b0c40770689061c8042a7625b18de750db,8d488a9fef008453c4632993d15503f0cb1f2075..b65e65aa07eb12ab1d2c8006a13308442f644e20
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1043,16 -1045,9 +1043,8 @@@ static int sd_media_changed(struct gend
                                              sshdr);
        }
  
-       /*
-        * Unable to test, unit probably not ready.   This usually
-        * means there is no disc in the drive.  Mark as changed,
-        * and we will figure it out later once the drive is
-        * available again.
-        */
-       if (retval || (scsi_sense_valid(sshdr) &&
-                      /* 0x3a is medium not present */
-                      sshdr->asc == 0x3a)) {
+       if (retval) {
                set_media_not_present(sdkp);
 -              retval = 1;
                goto out;
        }
  

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/btrfs/volumes.h
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/ocfs2/cluster/heartbeat.c
Simple merge

diff --cc fs/reiserfs/journal.c
Simple merge

diff --cc fs/splice.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/scsi/scsi.h
Simple merge

diff --cc kernel/power/swap.c
Simple merge