1. 20 Jul, 2007 36 commits
  2. 19 Jul, 2007 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 64fb98fc
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
        ide: add support for SCSI ioctls to ide-floppy
        ide: remove stale changelog from setup-pci.c
        ide: remove stale changelog/comments/TODO from ide.c
        ide-cris: handle PIO auto-tuning in tune_cris_ide()
        ide: add PIO masks
        ide: remove ide_find_best_pio_mode()
        ide: drop "PIO data" argument from ide_get_best_pio_mode()
        ide: ide_find_best_pio_mode() fixes (take 2)
        ide: add ide_pio_cycle_time() helper (take 2)
        sc1200: remove stale Power Management code
        ide: ide_start_power_step() fix WRT disabling DMA
        serverworks: fix DMA
        serverworks: always tune PIO
        ide: add ide_pci_device_t.host_flags (take 2)
        ide: add ide_dev_has_iordy() helper (take 4)
        ide: make ide_get_best_pio_mode() print info if overriding PIO mode
        siimage: PIO mode setup fixes (take 2)
        atiixp: PIO mode setup fixes
        ide: Stop mapping ROMs
        IDE: Remove references to dead ETRAX-related variables.
        ...
      64fb98fc
    • Al Viro's avatar
      coda breakage · 5f47c7ea
      Al Viro authored
      	a) switch by loff_t == __cmpdi2 use.  Replaced with a couple
      of obvious ifs; update of ->f_pos in the first one makes sure that we
      do the right thing in all cases.
      	b) block_signals() and unblock_signals() are globals on UML.
      Renamed coda ones; in principle UML probably ought to do rename as
      well, but that's another story.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5f47c7ea
    • Al Viro's avatar
      missed cong_avoid() instance · c65c5131
      Al Viro authored
      	Removal of rtt argument in ->cong_avoid() had missed tcp_htcp.c
      instance.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c65c5131
    • Bartlomiej Zolnierkiewicz's avatar
      ide: add support for SCSI ioctls to ide-floppy · 89636af2
      Bartlomiej Zolnierkiewicz authored
      Now that ide-floppy supports SG_IO we can add support for SCSI ioctls
      (except deprecated SCSI_IOCTL_SEND_COMMAND and legacy CDROM_SEND_PACKET
      ones - we can add them later iff really needed).
      
      While at it remove handling of CDROMEJECT and CDROMCLOSETRAY ioctls from
      generic_ide_ioctl():
      
      - This prevents ide-{disk,tape,scsi} device drivers from obtaining
        REQ_TYPE_BLOCK_PC type requests which are currently unsupported by
        these drivers and which are potentially harmful (as reported by Andrew).
      
      - There is no functionality loss since aforementioned ioctls will now be
        handled by idefloppy_ioctl()->scsi_cmd_ioctl() (for devices using
        ide-floppy driver) and by idecd_ioctl->cdrom_ioctl()->scsi_cmd_ioctl()
        (for devices using ide-cd driver).
      
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Cc: James Bottomley <James.Bottomley@steeleye.com>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      89636af2