Merge by hand (conflicts in sr.c)

diff --cc drivers/scsi/sr.c
index 39fc5b0fbc1803a254257831bb8df685edba216d,f63d8c6c2a3314303a95544b14cc1d2c109a903a..ce63fc8312dca45abf1794f43d20a1e57e6ad966
--- 1/drivers/scsi/sr.c
--- 2/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@@ -736,8 -729,9 +717,7 @@@ out
  
  Enomem:
        cd->capacity = 0x1fffff;
-       sector_size = 2048;     /* A guess, just in case */
-       cd->needs_sector_size = 1;
+       cd->device->sector_size = 2048; /* A guess, just in case */
 -      if (SRpnt)
 -              scsi_release_request(SRpnt);
        goto out;
  }